From nobody Sun Jun 28 00:30:12 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 4gnr0P2Nwfz6jDGj for ; Sun, 28 Jun 2026 00:30:13 +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 4gnr0N6Jz4z3dKQ for ; Sun, 28 Jun 2026 00:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606612; 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=EWqYYofbAIehwMdWV94fK9KsD2UutYtVo1B3VLDPPTM=; b=BqQ+vUjeRlfCeg6EGJYPo0BRPpkgt28p6i6+CvLmjl2qqXJ8Krws5sgyEmTgl8ezFvTVWi lsqZn3U48AT85bPoeZVtCUNudAvfVHpCcq3C/WIoeYOVU7ay5+4lzPDCAKDSyltSIZW/QD 2Mxwy5N0LpL4ao2uddh+X7gNxKqIuZEPAQXGw5XETtx1Ksov+/ya6FaIqhlv5JR9ITziDk etSsl3JEiMhzqkKPPdy7jQR8MWTYCXBH6DH64jaCr34C7JYjBExV7zYXUGmUK1GyWXw4BM U8fbuhUoB3c0DVZb2XE8Vr/zgK5bgbXUnNb76rvGHlsHMfD7ga8xuR3WB2QHLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606612; a=rsa-sha256; cv=none; b=IOeAJOq4ieWxc/7WAv+e+3+5QCChxd+WWFQbfjPTwgYZXWwH0iwq8P+tDueQW5oT9sD6CO sRrF+5Ngp/27p/MPdGMe6Z8X0DrxBT+VGnzmuFGH3rCQsg1WiA3OI38tEtA4m6Y1OpJIFf XvegZmhCWQWLdXfNkHR8UvPGghrHSx7tQwWFp46/1FIwZ+EC5DrzTMAkdMErSH/bdwsP1R nshfu3YGsNcEOmrZGz4z6Br9OYFr5tWOpzwP5WysOT4Y8JC8cmddfrtNppSU+bN7J4Cq0n +0VCNVBdGm1tv4SfJSdnmGl0nKUMeNPPB0B7Siv0Nqy8a0thkWsYx50D9r0Q2g== 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=1782606612; 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=EWqYYofbAIehwMdWV94fK9KsD2UutYtVo1B3VLDPPTM=; b=gofRMM4yb1FzZx0t51jZiKekeV/EQ0ywjGEr+dp00B03zrSWVnJEWDJQysf8dylBEHE+eW JWDaNG6sw7JHDxUcD1Adj7sLw6yGsMxrUlTluRb7z8L/zjbu7KhW0/0bRUtx94FZ5VBC3e fNyMOspZBUt/jvmUaGCBXpAH2t/dXo/4B8VQP7vq4YHvnD5pAH8rf5KO7SlwAHW9Hrgnfd dthGCNzhs42rOf/u/LaEiA3lld44gW7zNhvfu+D013Msikw+KxNS2qIyMy0+1dc217XFXY 5ItNrCKW/aveMe9SjuZ4ykEQBjcVRWtwxSWk0McsO/gqlDetzTXS3KevTTRQow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0N4Tt9zn3R for ; Sun, 28 Jun 2026 00:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f122 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 23ebf0c97ac5 - stable/14 - kern_procctl(PROC_WX_MAPPINGS_PERMIT): ensure stability of the target vmspace 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/14 X-Git-Reftype: branch X-Git-Commit: 23ebf0c97ac5fcd6adb6cda8a8707b99257721a6 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:12 +0000 Message-Id: <6a406b14.3f122.509aa70d@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=23ebf0c97ac5fcd6adb6cda8a8707b99257721a6 commit 23ebf0c97ac5fcd6adb6cda8a8707b99257721a6 Author: Konstantin Belousov AuthorDate: 2026-06-15 13:32:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:02 +0000 kern_procctl(PROC_WX_MAPPINGS_PERMIT): ensure stability of the target vmspace (cherry picked from commit 6a572920f251ac8ac6a80a55d4d039736ea7dd65) --- sys/kern/kern_procctl.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 23b3403fec4f..bdcb4d544cc6 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -872,37 +873,41 @@ wxmap_ctl(struct thread *td, struct proc *p, void *data) { struct vmspace *vm; vm_map_t map; - int state; + int error, state; PROC_LOCK_ASSERT(p, MA_OWNED); if ((p->p_flag & P_WEXIT) != 0) return (ESRCH); state = *(int *)data; + error = 0; switch (state) { case PROC_WX_MAPPINGS_PERMIT: - p->p_flag2 |= P2_WXORX_DISABLE; - _PHOLD(p); PROC_UNLOCK(p); - vm = vmspace_acquire_ref(p); - if (vm != NULL) { + error = proc_vmspace_ref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_DEBUG, &vm); + if (error == 0) { map = &vm->vm_map; vm_map_lock(map); map->flags &= ~MAP_WXORX; vm_map_unlock(map); - vmspace_free(vm); + PROC_LOCK(p); + p->p_flag2 |= P2_WXORX_DISABLE; + PROC_UNLOCK(p); + proc_vmspace_unref(td, p, PRVM_BLOCK_EXEC | + PRVM_CHECK_DEBUG, vm); } PROC_LOCK(p); - _PRELE(p); break; case PROC_WX_MAPPINGS_DISALLOW_EXEC: p->p_flag2 |= P2_WXORX_ENABLE_EXEC; break; default: - return (EINVAL); + error = EINVAL; + break; } - return (0); + return (error); } static int