From nobody Fri Jun 26 22:20:49 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gn99Y4w6yz6j2Yd for ; Fri, 26 Jun 2026 22:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn99Y371xz3mJJ for ; Fri, 26 Jun 2026 22:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XE8IqQM0aVzE9+JezrslEmUIItv4z5hAOOtIi2a1qe0=; b=LiyUds5QhrIGZLAm/zR7bgY0shWpysDtJIzg4TXJQMNi9bABC8CaLeonCbPQoJsEdX0Eez 4gTyOXgE8SWVe1Mr2DZO6Ushe4Z9j7E2obW8RVZeUz/XBdWD2HyNVWNbswN6ehkDO2ch5p iNAeKAxhT8bL0STnhDTStT6n53/2HlZTwRg77rG3Y8eGilhKOoNGWIvisUN4PgSgTFQ9/A gjG8LPm+HAMWa4UJm7g3/S9BzP7q9Tm6yY8+u0QDi5hF5pcpr18HiqF6eKgwCugQeuV1TV x4cAiIz2OPw4eHuNUCrCjdkfsfEMHhQG4sqXIkv3C+vdYAe57NfnMHUDTfA12Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512449; a=rsa-sha256; cv=none; b=oL7VMFDJpc8MFK6LttbbVNRy5RHaSeO+9Jl8zxrfIEI0BRcyOtp4YRILl4tuxVsCQ7T59q E9DfWIPGeg5PezLLoA5KbZVBYwfr/ML9S3/EQ+Y6URHWlIBPba7QL1jKRmoZGPnXv9vvEt 5t7Tadh5zBN1MvfkQhvLCuW5A2t31GdKSl5Pc0PXHeeSMGtAngVYBlNzoe5ZjFt938NpmN gjHTJIUoE/LMlMVWX5QN7biMOHRnOihjRbMXmiDt5h2Apqd2wvXxckTwMEVTndTynoFLI/ IElDmMTesqb3Bu16s561iHIsvJiBalUndBvgZjVhrVyGzbmbrxJa0yIBrimIcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XE8IqQM0aVzE9+JezrslEmUIItv4z5hAOOtIi2a1qe0=; b=ZrrdRzqAb/Pg6T+BIhtzFk96Mjl1NIvv6R282/CeXN9ucHl6QHtQ2kxJQC1y2nb8rP13Y4 D+ebEGXMtQYo82dDjhnd35M95oqLllaIAcBYR2wGXCv4xKmP0juedzSK8+np4Gbv6Dj/l5 hArcUXcpSszXI9Es7gcvdIASGcqUzT5uDeiKJ5vV/wyezJiYs4g3DZJEWyIaHN130Sd0jY zwvOV0QMtY2bv8i8RMUhC9xhBekXQohcX3KG7Er97fn+zdXUJAzVbkAiJuM82sufVOmrSH iURwLqrfXeWKr61M/tL+91CQGdclBDR88l8pNBPhPLBMcT5afxWinO6/YqtJHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99Y1mg1zxSD for ; Fri, 26 Jun 2026 22:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 20ed389b3650 - stable/15 - kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vmmap List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 20ed389b365030b868298d7ab4e8a01270c06c9f Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:49 +0000 Message-Id: <6a3efb41.308f0.22a47439@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=20ed389b365030b868298d7ab4e8a01270c06c9f commit 20ed389b365030b868298d7ab4e8a01270c06c9f Author: Konstantin Belousov AuthorDate: 2026-06-14 23:49:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:05 +0000 kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vmmap (cherry picked from commit 5fe6e08d2db56b530f0df2903ef24cfabab7b8ea) --- sys/kern/kern_proc.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 7c1a75e480bc..5d37d0b5fa39 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2425,6 +2425,7 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS) int error, *name; struct vnode *vp; struct proc *p; + struct thread *td; vm_map_t map; struct vmspace *vm; @@ -2433,11 +2434,12 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS) return (EINVAL); name = (int *)arg1; + td = curthread; error = pget((pid_t)name[0], PGET_WANTREAD, &p); if (error != 0) return (error); - vm = vmspace_acquire_ref(p); - if (vm == NULL) { + error = proc_vmspace_ref(td, p, PRVM_CHECK_DEBUG, &vm); + if (error != 0) { PRELE(p); return (ESRCH); } @@ -2549,7 +2551,7 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG, vm); PRELE(p); free(kve, M_TEMP); return (error); @@ -2644,6 +2646,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) struct ucred *cred; struct vnode *vp; struct vmspace *vm; + struct thread *td; vm_offset_t addr; unsigned int last_timestamp; int error; @@ -2655,10 +2658,11 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) _PHOLD(p); PROC_UNLOCK(p); - vm = vmspace_acquire_ref(p); - if (vm == NULL) { + td = curthread; + error = proc_vmspace_ref(td, p, PRVM_CHECK_DEBUG, &vm); + if (error != 0) { PRELE(p); - return (ESRCH); + return (error); } kve = malloc(sizeof(*kve), M_TEMP, M_WAITOK | M_ZERO); @@ -2762,7 +2766,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) if (vp != NULL) { vn_fullpath(vp, &fullpath, &freepath); kve->kve_vn_type = vntype_to_kinfo(vp->v_type); - cred = curthread->td_ucred; + cred = td->td_ucred; vn_lock(vp, LK_SHARED | LK_RETRY); if (VOP_GETATTR(vp, &va, cred) == 0) { kve->kve_vn_fileid = va.va_fileid; @@ -2818,7 +2822,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG, vm); PRELE(p); free(kve, M_TEMP); return (error);