From nobody Sun Jun 28 00:30:05 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 4gnr0F4Nr4z6jDTH for ; Sun, 28 Jun 2026 00:30:05 +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 4gnr0F2Z4Zz3dPD for ; Sun, 28 Jun 2026 00:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606605; 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=NIWWyz6GLloDEI8Inh90IBA9HjmOPCAD/fd7pSwiHFk=; b=EaTM08kdYgf45eN1hpn9JviQQI3lRjGAsBZxTl0uDFd25mIkIVu19pGVK4STSUTOdmJSFb WcN7a8fpt89QubVRGZhhDiPK1ZRBj7IoJhCLR2ChF6mBAMdehPm9M6dQS/t2RIN935NW9e yrErB7xVzPJxPj3jia9FPjBECdKxaDKZuMxQdNlO8cWjvPc/e1MwRhp33/1IAbiwCCSpXu p7560Bjbt7+m9gc+Wou3VokjN9/KDOP8bPDxAZL+ATksIyI7v3i3UdUwk4VPNLOEo9OLtD ymbuZcx8PuM+oAEK8yq06Xl7ui8DavSztpaYtbPIAvsDdNyPIPfTmwh//TQrgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606605; a=rsa-sha256; cv=none; b=RWbM1GHAyG+4IM7AkYd/0vD8dr9AYLzTL5rezYT+sojfEslVhJdyLtQKcKgeU2aXuWiHoR Q40YwDwZ4iMrzVo8LFEpNW0JHLpVcBhuY54+gu609ohtFJRjRAOopKhduD2mCABOEDWhBQ pSTy8Brbb39ex5H01zEsyW6i4Az/b0CJE90m+J23yKkngjjKdmv3pvbWTj1rL8J7z6OgB8 Vz7ScaJ8yGyYJSBi+zY2WW1pYXumz3a0yggQCtwEDmlc70ErIgW1ph85iKuJLzs7gnKoxS hyDnp2QjEEPrLAKV8QzAYMIE0oyC9aNJoKJ87uwY+GCbtEh+taKoXyUzyJ9ZWA== 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=1782606605; 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=NIWWyz6GLloDEI8Inh90IBA9HjmOPCAD/fd7pSwiHFk=; b=LnoYYo99DAbfV0GRNAczoVT82yKXFTup/5cJW/NOg1vk+H58YiT3+g9t8jDPKtCStatiJj sMEkfA2+ty4Df9tsXrUkftFoIuOGXE1k+PKEpZMBVGQdnR2z4OglUU1dVpOhZqpw+BKgS+ aAqZlQZIvFrCY6QBCM9IGSnTFLfdVWgAtH1K2fghYFq3bT8ZUp/WySTDDUCxgx0UrwmbXb p69ktiZ13bzyKe8kwxEu4Bh0mIf/+XCwyMsIvhlBeVhF3wpQEEHbUkdmg+6Y/MGXZnvskK 2HY6I1a/NdQk8B1Fpi10prtV+zcj8ACr2tBv3wcE3WgBbf28H3HrYp2p58HSwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0F1cdrznGk for ; Sun, 28 Jun 2026 00:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e2a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e856c10a4d6d - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: e856c10a4d6dfe30a730246b2050d9dd438085db Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:05 +0000 Message-Id: <6a406b0d.3e2a8.555961d9@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e856c10a4d6dfe30a730246b2050d9dd438085db commit e856c10a4d6dfe30a730246b2050d9dd438085db Author: Konstantin Belousov AuthorDate: 2026-06-14 23:49:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:28:58 +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 3ad9e157d622..6c010490f43b 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2420,6 +2420,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; @@ -2428,11 +2429,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); } @@ -2544,7 +2546,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); @@ -2635,6 +2637,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, ssize_t maxlen, int flags) struct vmspace *vm; struct cdev *cdev; struct cdevsw *csw; + struct thread *td; vm_offset_t addr; unsigned int last_timestamp; int error, ref; @@ -2646,10 +2649,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); @@ -2764,7 +2768,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; @@ -2820,7 +2824,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);