From nobody Sun Jun 21 11:48:02 2026 X-Original-To: dev-commits-src-main@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 4gjqMl66vRz6jZ9p for ; Sun, 21 Jun 2026 11:48:03 +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 4gjqMl0rYhz3W6n for ; Sun, 21 Jun 2026 11:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782042483; 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=n26TjW6PHdfi31ufU31apcnhjxKJn9bvoONfvAalXMY=; b=v4Yshj0FkWo7SPntnWYKG3KLsFhtG3R6/JURCstXgMEGGHQQgqsBB8VdmgUxl808KQcFzN IcBUp3G01+Tl/21TJYjPy6W87uJGSK4YHWoKR0JBaC6KnqODCcmQa2nyc136kL2YoHjbd8 b12pdAkDNx/Q1NSACFsp+OJCH3hrLPjbM3dKpJ4PHEJDipKmTnUqeIHm5wmr1dRhZrtY1o mawCrVUpoShAwGW6XfOjbAafEs6J0ryXZMAnV5x43MgycijBhZN8XUOeVg1TOIKFsH3npO gDM0BZJ6vePXtft2t/cwFQOdxwkrXpVf/yiW1W2BaDCsBsB1bWodeSOcT6I9dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782042483; a=rsa-sha256; cv=none; b=LVuRDxMsq0GB/viox3zYBZKjnkSrJPpn6BOHNEu+08WRYZMyGKpLR9q19ZMKwYQ66oniWf pBhrK0sSO0E/dhPKXkHNjFTcUV1fcdr9zloazMd1xIWoIiC63+fZWkL7rKzN2vuYXYNcRv AXua7mj5VcRx+hvA3caNOTegO6vR5BlZSZ3qk8XKqrxJ0BW+9H5wtN7M3pO20tGtWojnAR he22qm4rymYZBpR/gSKJ5GU5q3Kp3s4j2VeuJ5i8glxP+YM7pj2VFdr/o5+bztPu2b4p1d faYeR2pnXEdV2bkZl2e0Sujy1px9ksfLO0lf1iVt2TENyBCGeYAfkHQYGpqAUw== 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=1782042483; 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=n26TjW6PHdfi31ufU31apcnhjxKJn9bvoONfvAalXMY=; b=t9/utJdwCWvvTstBpaog+3n4J5D8TzfTpJCWwN7320GTx+AilrnY7Bl+1fXGmboXyyF4sI hEuOgjEkalxoUETIFBA+Y05acUZjE358JqWEsnLvaqdfmt5GmkHD4vkrkJ+LFYCN006kry khHn9R7wwOIfrI2g0pUvKW+aY9gZOD/eGHvYIhgEP5KMs90rKrY1rpVRZ43A8HOEZAwh3v 2w4xZbElB6Ka5SCspNYNUW+XkmNLOcV+1tmEX8ZL2xoWBbygq8nIJBMXk3+LELeMtiiFqf /nwDB2Xts4AlJNIA/GDuNAr5Lz3O/W+UviWg4OGNGZjzhuPiw0hFk9M1nmj39w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjqMk6ch2z1FG1 for ; Sun, 21 Jun 2026 11:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26855 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 21 Jun 2026 11:48:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5fe6e08d2db5 - main - kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vmmap List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5fe6e08d2db56b530f0df2903ef24cfabab7b8ea Auto-Submitted: auto-generated Date: Sun, 21 Jun 2026 11:48:02 +0000 Message-Id: <6a37cf72.26855.6d7816dd@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5fe6e08d2db56b530f0df2903ef24cfabab7b8ea commit 5fe6e08d2db56b530f0df2903ef24cfabab7b8ea Author: Konstantin Belousov AuthorDate: 2026-06-14 23:49:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-21 11:46:52 +0000 kern_proc.c: ensure stability of the vmspace for sysctl kern.proc.vmmap Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57497 --- 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 2481823c97af..1fff6e5629ea 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2423,6 +2423,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; @@ -2431,11 +2432,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); } @@ -2547,7 +2549,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); @@ -2642,6 +2644,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; @@ -2653,10 +2656,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); @@ -2760,7 +2764,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; @@ -2816,7 +2820,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);