From nobody Sat Jun 6 20:07:27 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 4gXq8v5Qmbz6gKgv for ; Sat, 06 Jun 2026 20:07:27 +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 4gXq8v2mFDz46Km for ; Sat, 06 Jun 2026 20:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780776447; 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=b2SyBfQMgDxsCe3d/a/OsKkj0yISvBDIEy3D9qgsG9k=; b=OgUdpS5eGWFzix2pn9L2d57/imt5ExmRkTvoxQ5XpS9fHUw/k32UFvcKa3+u5BQNreYzWp LYKf0pBBaAtGX7RGAROXYpvX2PoUtt07htf4l38imA6gvRCnQ0DrTGWlpIzT3pisNtfZsk i54cBa1oE3eooyP0aQiLWlkGQEvPgBP0QtyASDg7kJW9ava9aqeAuZwbjBaoxa9C5DsO/Q o8TJXmozGNsNdsxYCdioT6PpVIcYy4I+OfE718bL8DniOnTruBBV9nh9XH4iVxG8nKBpI5 grBF+PNqc1xyWZ5Yt5DZaMAZWIH5nyDqDoz2HlIiUqorL+UN0qXktEps/Fyj4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780776447; a=rsa-sha256; cv=none; b=omoS5IEDyrGeKibfUTuDIZZTe8uhWxNvN7vDvgSw2Djs3pqPs6ACDMMV4OiiRouybDUmk9 L0Tkz8rtVw5q9g7rhZ9VCoBbqnk/2O7WcKsaVdpY44Zh/rGAU1jTdPmo+j8LLw2xUX/tsU 8Vo5tB3uPYBjBHVqO7kebUSPIeHx/IXEAwyrrA3waYrPi5OFhJIVDkIT5ypAUfiCtutRAM 3RFB0FSWncoYCfTwYW3y1lAut3TDyUBYzA4RBa3uemaVX6ttCT95fnAqNoCTJ06ES4AbXi ZtjmiuHIye+wsFK865MQh2cjDJynNTiFdb58WtYDIMWsAAxqpusJg/h9bXiLdA== 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=1780776447; 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=b2SyBfQMgDxsCe3d/a/OsKkj0yISvBDIEy3D9qgsG9k=; b=OPgIVa2/VqqC9bjhDNbSTjVUvoUkPisWESd6FGVJ31y/heUu/N8sxNiO8mzr9kFlKh8WjW m6e8RpNMKgNM91QqSKLbz9zJKRP0aAwyyeYf5M6mLuUAtdz41AHacYHMYpMO7J4MTuHg+V VeeAAcUG0vx9xbgW66bqGSe3awgsZe1N+9X3t6WjQ7IV9Nco/1TIFzISdBVgNEnnH3AFRt aneeU0Iie56oO0QiwGzr/wVfSL9pgC+aqsNna6f0M1YZVVL2i4a4F3/5V7hTJt7Ml6/4dY hmeqQbbTsyDAU7x33fUsJ9C5Yd8sEhXoKbrjexKl1NlZm2yN9FS1lejUIGIaaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gXq8v1K8tzTwq for ; Sat, 06 Jun 2026 20:07:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40812 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Jun 2026 20:07:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a845480cc122 - main - procctl(): do not allow the process to exit inside kern_procctl_single() 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: a845480cc122f45cebc5fbbe43de6b1c096d852b Auto-Submitted: auto-generated Date: Sat, 06 Jun 2026 20:07:27 +0000 Message-Id: <6a247dff.40812.3a7d0d39@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a845480cc122f45cebc5fbbe43de6b1c096d852b commit a845480cc122f45cebc5fbbe43de6b1c096d852b Author: Konstantin Belousov AuthorDate: 2026-06-06 16:52:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-06 20:00:30 +0000 procctl(): do not allow the process to exit inside kern_procctl_single() Requested and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57491 --- 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