From nobody Sun Jun 21 11:48:10 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 4gjqMv1jhZz6jZT7 for ; Sun, 21 Jun 2026 11:48:11 +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 4gjqMt6ppFz3WK4 for ; Sun, 21 Jun 2026 11:48:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782042491; 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=4QogDk7wSMQ8ClyGUB9M0azvfE6rj9gbFWoVhUdLq0w=; b=A4gusHcCc7TyxPn6OobzoAe9LKk+VXpxMtMYkStYfD/BxLXJXBWNtdAfItYo78P6W/Adut BocfFQprQonhZaKHPaprJW3HLZtyj4ujJETKstOsZ85fupyV0CGda0HlC0vghkye/G90t+ 0Tp7ERGLZIeuBb0DtKoAy4JFpgz7i/MYl7O8kbDOpzj8vmML/X5wLalaJAm8gRGL0Y0ZSi HdLL7ZOLMiAsN+NU/nB2dB3SjWuOeTXNnfUXdUHUUUmgBUNA/5GPrW+ef3uPbUW/hOF4nE Hrgnl7X3tBmdnvuEMMWw43li9lJVHCYXxS4QKWcRvB4uHOvyjrjHyYdyOChJNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782042491; a=rsa-sha256; cv=none; b=CG6cklydHjdZkLureI8dqs/JRgCpMBEid+I9x+pRPTPPbmuQAzEOo1GakRoDTxqto9K9dF 3s/Ju9MUSgeSxdVctNWhNiliFz3bi2OMVNConhjMS1LytFJwPXwEua9mbtOOFlgVcT1pRu HUKCuLIjYkQbVgIfQRWcSS+DMHcSKjgg6pnqWpWFSg6QXN6EC4oSIr5VDzmRwhfESCdYTB WWh40+1FZP7fyiVG9Dmj/+ztS1FNZDL1jq7BU6sqQU4r+jRf00xmjDlpGVcmO9WpwDWBeX M4Wa2eA6rv4REG+Y9a7/mCpPa5b0gl6wOWcxQjvBd4GU+GvuEF5J9XtUxXyxiA== 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=1782042491; 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=4QogDk7wSMQ8ClyGUB9M0azvfE6rj9gbFWoVhUdLq0w=; b=iRTX+ZIKIkPW1fh21QBJxxhfnF62YFFlHuWZTrnkkSCGIAQB6zGeufUdz1D3UG8hHIBU0Y UqAzWrXAR5D/uQs/1M8tF0j/AYapc6L2liFR/2QyWVH8JhpsPZmNLTA3L1kvmZGxCNvN95 F56vbJ+AJ4BGUqorWnH9+Q7nftR2Q9Q2dj6z8GceG24cDSLmurXKKigKlqDE+8DXzU+Ju0 E997qVkP+/MDEEhcaYwk6GCXGsKBXoNG2KV9f28AkeAZQ0o+bXiElZYDhgCgvAw73qdHEM H+02VmPelBafinIEIF/MUvJ1jnMNOM1wss1iWFTtPGYltAz/oTXRQixqide4iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjqMt5HrBz1FJQ for ; Sun, 21 Jun 2026 11:48:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26fa3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 21 Jun 2026 11:48:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6a572920f251 - main - kern_procctl(PROC_WX_MAPPINGS_PERMIT): ensure stability of the target vmspace 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: 6a572920f251ac8ac6a80a55d4d039736ea7dd65 Auto-Submitted: auto-generated Date: Sun, 21 Jun 2026 11:48:10 +0000 Message-Id: <6a37cf7a.26fa3.6cecfd92@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a572920f251ac8ac6a80a55d4d039736ea7dd65 commit 6a572920f251ac8ac6a80a55d4d039736ea7dd65 Author: Konstantin Belousov AuthorDate: 2026-06-15 13:32:47 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-21 11:46:53 +0000 kern_procctl(PROC_WX_MAPPINGS_PERMIT): ensure stability of the target vmspace 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_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