From nobody Sat Jun 13 01:03:50 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 4gcdS71h5yz6hShd for ; Sat, 13 Jun 2026 01:03:51 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gcdS663zMz3lk1 for ; Sat, 13 Jun 2026 01:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781312630; 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=4HinFeTPv7MmlPnqy3LRS3gaVRz8kuREgiH7nRbuh18=; b=TKvpqySinpdWL0ZAJgTkFeljVPSMfTbaZ+K0+XaqSSH48WS2yJd5cfNKoBJ6E14H5puBmb st5NtCQ5uglL+Ln57C5+yySVeYxD1W3BcxVs2+9xYxIXLCkZQYCphMcSfz+te+ryzIpqIY 8XiTE9pMsYuHpCVlrT9HAsYh/djDlhtVyHRfx33uODfBa+LRgLic6/ZJWc8X1E3IqA6Bck oJT033hTPiFNw3eFjl0ULoAPTO/VxGAw0TvVjUlk01OaN4Ue7bh03cCMSALIFSqUngWcIj uBiJfRtccjGyT/vbY34+2Nym/SurR/9ulnv82o+Rb3sjO0CgfJrwJRkHcYpKxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781312630; a=rsa-sha256; cv=none; b=HcTQagLU36OaiCTekIjGPFFeJMKi0YS3etPzPTTywRf5Mr+StauTzfYpxtRjCfX2sOT3le nuN1L/T3r+j+CQY/jMPuZMtPS8tHGOdOI5v3rEJ/ixWP6OV0DlaI6OkFK7/bEvr1cDH+vH ksetpMPZCZ2d0akdXeOfRAoaQG0+UfqEUOX5ecxuMPtb3cf/tByJ3BMD4onZYJSwlAuFYv 83aEaL7pCpEvO6rtLicVsj+7iNypffRlDMcujo7yo3JVxmNVCamKyy+zX24oSLJlRHvBhP GqtNTWZqQGB7btIzFYrv03IoUJapzGmkzJ6DAwzkL4NmXgn4upGeMd3bBQSfvQ== 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=1781312630; 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=4HinFeTPv7MmlPnqy3LRS3gaVRz8kuREgiH7nRbuh18=; b=cPHYji7nq+xwSbSU54YP0OsaMp9OTSnPzj82KP1yl2c/OiW6MbRGyJvHIJAjBaYpvhdqNi 8XXcXDm5Beqi2STiPPLaaDSp8m9dN3srKBC9URAAoYJxW4iZAkLvfiNdNURcG3KIYBMmrW lXoEL3Y2d4+vEN4+Z8tpq4CS0tgZdt4SxZQpw+tYcwfe4S/Gc/o5gcqczrFDbNaDZHCZ6c TTD9jmnL2X9tGMyfzzlP0vfw0/Hc/5yLb4p/n12PB4RuqowNvyz86n7uYVA9nMZI7qmMro ZN/9+NwCYRNlljXUUjP+N+V0eguWkeb/QrxyCEDgAH0HerB7rwkDXYq5jYFljQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gcdS6520Dz11QQ for ; Sat, 13 Jun 2026 01:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2072a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Jun 2026 01:03:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a4ceed16a794 - stable/15 - procctl(): do not allow the process to exit inside kern_procctl_single() 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: a4ceed16a79490b44cc1a8a1add5dabc0930279a Auto-Submitted: auto-generated Date: Sat, 13 Jun 2026 01:03:50 +0000 Message-Id: <6a2cac76.2072a.631e14b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a4ceed16a79490b44cc1a8a1add5dabc0930279a commit a4ceed16a79490b44cc1a8a1add5dabc0930279a Author: Konstantin Belousov AuthorDate: 2026-06-06 16:52:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-13 00:58:34 +0000 procctl(): do not allow the process to exit inside kern_procctl_single() (cherry picked from commit a845480cc122f45cebc5fbbe43de6b1c096d852b) --- sys/kern/kern_procctl.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index b1539c5cec4f..57ca5665d453 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -765,19 +765,15 @@ aslr_status(struct thread *td, struct proc *p, void *data) d = PROC_ASLR_FORCE_DISABLE; break; } - if ((p->p_flag & P_WEXIT) == 0) { - _PHOLD(p); - PROC_UNLOCK(p); - vm = vmspace_acquire_ref(p); - if (vm != NULL) { - if ((vm->vm_map.flags & MAP_ASLR) != 0) - d |= PROC_ASLR_ACTIVE; - vmspace_free(vm); - } - PROC_LOCK(p); - _PRELE(p); + PROC_UNLOCK(p); + vm = vmspace_acquire_ref(p); + if (vm != NULL) { + if ((vm->vm_map.flags & MAP_ASLR) != 0) + d |= PROC_ASLR_ACTIVE; + vmspace_free(vm); } *(int *)data = d; + PROC_LOCK(p); return (0); } @@ -844,14 +840,11 @@ wxmap_ctl(struct thread *td, struct proc *p, void *data) int state; PROC_LOCK_ASSERT(p, MA_OWNED); - if ((p->p_flag & P_WEXIT) != 0) - return (ESRCH); state = *(int *)data; 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) { @@ -862,7 +855,6 @@ wxmap_ctl(struct thread *td, struct proc *p, void *data) vmspace_free(vm); } PROC_LOCK(p); - _PRELE(p); break; case PROC_WX_MAPPINGS_DISALLOW_EXEC: p->p_flag2 |= P2_WXORX_ENABLE_EXEC; @@ -881,15 +873,12 @@ wxmap_status(struct thread *td, struct proc *p, void *data) int d; PROC_LOCK_ASSERT(p, MA_OWNED); - if ((p->p_flag & P_WEXIT) != 0) - return (ESRCH); d = 0; if ((p->p_flag2 & P2_WXORX_DISABLE) != 0) d |= PROC_WX_MAPPINGS_PERMIT; if ((p->p_flag2 & P2_WXORX_ENABLE_EXEC) != 0) d |= PROC_WX_MAPPINGS_DISALLOW_EXEC; - _PHOLD(p); PROC_UNLOCK(p); vm = vmspace_acquire_ref(p); if (vm != NULL) { @@ -897,9 +886,8 @@ wxmap_status(struct thread *td, struct proc *p, void *data) d |= PROC_WXORX_ENFORCE; vmspace_free(vm); } - PROC_LOCK(p); - _PRELE(p); *(int *)data = d; + PROC_LOCK(p); return (0); } @@ -1175,9 +1163,15 @@ sys_procctl(struct thread *td, struct procctl_args *uap) static int kern_procctl_single(struct thread *td, struct proc *p, int com, void *data) { + int error; PROC_LOCK_ASSERT(p, MA_OWNED); - return (procctl_cmds_info[com].exec(td, p, data)); + if ((p->p_flag & P_WEXIT) != 0) + return (ESRCH); + _PHOLD(p); + error = procctl_cmds_info[com].exec(td, p, data); + _PRELE(p); + return (error); } int