From nobody Fri Jun 26 22:21:01 2026 X-Original-To: dev-commits-src-all@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 4gn99p0X0Yz6j2j2 for ; Fri, 26 Jun 2026 22:21:02 +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 4gn99n3fBcz3mWl for ; Fri, 26 Jun 2026 22:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512461; 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=i2c6VP0TgKPfZXnoySRP9dYfm30ysHSXG4pv3cAReF8=; b=RN+XWU77KIYsn2WTpAH9y+z2qCkI5ibxQP+p3ZNdR6LuLFPCCBDQir4YgQnjD3iIX9W58A Aw+uz2SPjQrWE98/zJsUt0M6dHc0ZHxocSys8+a6yfP/tEZ5DCGILVcgM97UAS9+ctYXKH 6W5MB0E0/4XEAPXukBnViJ1/uFvPre7yFKqT2PYiGchfyK30wt+1c/Kp9AgCmx398kWMGl 4wCT6VYeIaAoCY/amaiijeGlAlsyqVebBxtfZLSYSUYyS0y5V2VWBFKPRbdKTdq4AAMUEY E7f40KzN2d9rOxRjm4V+8ZJh/iCnoi8nRg9u38pPxmfT2d6M03r1ixlUUVg9sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512461; a=rsa-sha256; cv=none; b=gIb5CWQIVUkicCrqfagB8M8yw/QDPm0o+zGUstJfqtUxSAx4LUOURp5hqmB/SqjTmtBPtG b7thL3/858CEgxazl0XdVjqgqGQWf84JJTsPslEozWJthjy+tOz6r0dySAFfZPcEoMzON0 f5pmnO2sShfbUm///bnJ50tG4YUIZO7CHPqIgwZt/DW1F9YBP5chAhkKjBRChgwrENjWtT gF4h/tZUr1eisjDzOMyphyp/uSUQAZWHRpvEpQ4d7p+6LZuuVcdNcafdFayxoA+0nn0doc JNAi6FfoGWlXtnKKwnwQGwznqKB0RIikWAtk6F2ae7v/QAVScoGrGC9bqkuQzQ== 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=1782512461; 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=i2c6VP0TgKPfZXnoySRP9dYfm30ysHSXG4pv3cAReF8=; b=DhkLTT/CwMr8cLzrMLSigQvRvGIA3Pwayut45PGwMYpnK2fg+dylyi6gRPdxpFqY6Ga90h S0IV3jLAnS8BWrFTz2xhUDU0cZvtQV+mYB+XiPRPt9TXmpkmXqeZfRZc6ebcQiYOWhW3sy KteMgrgxuqnEAIxg+532uZ+eMXQM5TpLEpLYoa4RylfK8FCpilZlJb+g7HFNaA3+QpQvk5 e+DmfXjEyjIrnAhO4E4HJfkkhRG5P0wwDZTgjAY6Uw4TxFrXJRSNaBakbAuFpCFxAm51Lv C+Bf4T4r1JOClvA6VaTdbXdZET+Jal3SnmP7PC/NOFAqM5LbBM+2VBkzX26F4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99n2JpgzxKB for ; Fri, 26 Jun 2026 22:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30aa3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:21:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 78981848b85f - stable/15 - procfs, linprocfs: ensure target process vmspace stability List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 78981848b85fdd826eb830dfdd6d92c14b0f8bb3 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:21:01 +0000 Message-Id: <6a3efb4d.30aa3.7d83efe@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=78981848b85fdd826eb830dfdd6d92c14b0f8bb3 commit 78981848b85fdd826eb830dfdd6d92c14b0f8bb3 Author: Konstantin Belousov AuthorDate: 2026-06-07 18:48:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:11 +0000 procfs, linprocfs: ensure target process vmspace stability (cherry picked from commit 5db31f1b47b586a5091eb41fc957236f28b78dba) --- sys/compat/linprocfs/linprocfs.c | 16 +++++----------- sys/fs/procfs/procfs_map.c | 17 +++++++---------- sys/fs/procfs/procfs_mem.c | 6 +----- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 786a486b9143..9d0ceaa6245e 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1311,19 +1311,13 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) struct vattr vat; bool private; - PROC_LOCK(p); - error = p_candebug(td, p); - PROC_UNLOCK(p); - if (error) - return (error); - if (uio->uio_rw != UIO_READ) return (EOPNOTSUPP); - error = 0; - vm = vmspace_acquire_ref(p); - if (vm == NULL) - return (ESRCH); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, + &vm); + if (error != 0) + return (error); if (SV_CURPROC_FLAG(SV_LP64)) l_map_str = l64_map_str; @@ -1421,7 +1415,7 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_CHECK_DEBUG | PRVM_BLOCK_EXEC, vm); return (error); } diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c index d4913a7b0f1d..1ed785f1ad90 100644 --- a/sys/fs/procfs/procfs_map.c +++ b/sys/fs/procfs/procfs_map.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -93,15 +94,14 @@ procfs_doprocmap(PFS_FILL_ARGS) bool wrap32; #endif - PROC_LOCK(p); - error = p_candebug(td, p); - PROC_UNLOCK(p); - if (error) - return (error); - if (uio->uio_rw != UIO_READ) return (EOPNOTSUPP); + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, + &vm); + if (error != 0) + return (error); + #ifdef COMPAT_FREEBSD32 wrap32 = false; if (SV_CURPROC_FLAG(SV_ILP32)) { @@ -111,9 +111,6 @@ procfs_doprocmap(PFS_FILL_ARGS) } #endif - vm = vmspace_acquire_ref(p); - if (vm == NULL) - return (ESRCH); map = &vm->vm_map; vm_map_lock_read(map); VM_MAP_ENTRY_FOREACH(entry, map) { @@ -238,6 +235,6 @@ procfs_doprocmap(PFS_FILL_ARGS) } } vm_map_unlock_read(map); - vmspace_free(vm); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | PRVM_CHECK_DEBUG, vm); return (error); } diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index 824fcd33b2ef..eb692c32923b 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -60,11 +60,7 @@ procfs_doprocmem(PFS_FILL_ARGS) if (uio->uio_resid == 0) return (0); - PROC_LOCK(p); - error = p_candebug(td, p); - PROC_UNLOCK(p); - if (error == 0) - error = proc_rwmem(p, uio, 0); + error = proc_rwmem(p, uio, PRVM_CHECK_DEBUG | PRVM_BLOCK_EXEC); return (error); }