From nobody Fri Jun 26 22:20:56 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 4gn99j5hKgz6j2Wp for ; Fri, 26 Jun 2026 22:20:57 +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 4gn99j0jzrz3mKZ for ; Fri, 26 Jun 2026 22:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512457; 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=G28waci3Uno5HDiqBkonLUxsEZSP6h3h3FTo4KXRuM8=; b=A1LWzqjY9tqx5hBD3cmN9rHeS7MAddBamdskX2uSGYyoo87N12iYqh0NrqyzxfoMxsw1n2 q8GnrODmFps2FfABuoZQrOavUoDDFcAnHgEV3mssj33hzdpKb27YebfFHR140oecHYSId2 tc/q6f9/4LlpQIkmTgb3ZEK20NYTYAyJ5Dhx22/RC2BvfAJWoU7J+sdGbipriTx+cgBqkV u+UR9gvKLTGI2Q3cdPuwwuDA4yPG4bhQ74WobiPYdM8whTi8ow3P6m2GtvH6j4VLmj+csA KZ5NEAOH/QzajLwyZ42brqjP0qW+sdtpDU12i9AC/YwWXt8Zb6GDHlide9C2+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512457; a=rsa-sha256; cv=none; b=FzsZ6EM+1rqAZyz7bLrLGeZ8Xc6JGdRdM8V3CDm/J5q+DVi8+577WQHvNLUGyF+0xmk0tG mpseTcIzrk7moHahhUdMEpyJQpHGuPolhizgPbehec8uMkJJXYxTbLyu3JJPZ7n/EaTqU0 lcHR0o8Z6h3xcpkGMRUeVOATjS7G59D7Dt+EE1c/rsS6liyrU1E4zVvzSUYWBd2man/ReI 7A4WW1VS8neVNZUTP0nI82OBdslhpINSYpYOmMYIpQixqMmpkebbLPVviUAv8u1buAxvTh 59LaVDVDDhJd9c8qdrIgYapYNJm4cE8hAR50pqhpnxXwHbGkqk/gYJ0rR1JqCg== 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=1782512457; 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=G28waci3Uno5HDiqBkonLUxsEZSP6h3h3FTo4KXRuM8=; b=uTPdHErjqunzV0MWggbIFdOJle8TVR861TxpRkz3rFVdXuBTi6jBbFk98wqFolLWez0NV9 w41X/rM5QkqVqPKFmX8pBAy0Jd+X/vfP4vrhFLS+OUuSP3R/A8FeAaJwTe8F7kXLvVcsTE COojqT/iO0GLwijIbbMb03vcTayTsu/eiA6j3AWAHwduBO46DQeD5Zo3pQh3K6NLcwSYOT 1vRS/jN0yqdIKMUMsI2TtHR9KImMNc2zjuDY4Vv1L0zyhLe6fmd8/9hM5nqgtFWhBGlesw Z0JQ1b9ENBIFTdrD2lvWdB476yAHvSSgXOLjNdaX69OE4mMZB3NTS46kSTqx3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99h6PTNzxSK for ; Fri, 26 Jun 2026 22:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27c4f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d80a7fd6e6df - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: d80a7fd6e6df65b4d85e6977557c3fbe8d9ff02e Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:56 +0000 Message-Id: <6a3efb48.27c4f.61d46f60@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d80a7fd6e6df65b4d85e6977557c3fbe8d9ff02e commit d80a7fd6e6df65b4d85e6977557c3fbe8d9ff02e Author: Konstantin Belousov AuthorDate: 2026-06-15 13:32:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:09 +0000 kern_procctl(PROC_WX_MAPPINGS_PERMIT): ensure stability of the target vmspace (cherry picked from commit 6a572920f251ac8ac6a80a55d4d039736ea7dd65) --- sys/kern/kern_procctl.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index c8d14aa2f2f6..581b24f21d3c 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -877,22 +878,27 @@ 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); state = *(int *)data; + error = 0; switch (state) { case PROC_WX_MAPPINGS_PERMIT: - p->p_flag2 |= P2_WXORX_DISABLE; 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); break; @@ -900,10 +906,11 @@ wxmap_ctl(struct thread *td, struct proc *p, void *data) p->p_flag2 |= P2_WXORX_ENABLE_EXEC; break; default: - return (EINVAL); + error = EINVAL; + break; } - return (0); + return (error); } static int