From nobody Fri Jun 26 22:20:53 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 4gn99f0B3Lz6j2kV for ; Fri, 26 Jun 2026 22:20:54 +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 4gn99d5H9Zz3mMc for ; Fri, 26 Jun 2026 22:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512453; 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=G7RCQWucg2je1wYuaYLp0XBWMr5WHjkF6AMlHNUjl5c=; b=jO8V2bfYJnlBVaSuc0mIZSI5Jkff4IeT083uCeMIzU0lDMQl/LegfujXwcZSsR+A8U073D bZufhPl0ZG0hUiAmscOVNeOBZJJ2pF8xlsbxFobreB2RAh6hAy1BdUG5KHB08GaTWleglt 47VNhdf4o/Duf9yMIdPR89M7+qa8/h0KZx4hoicCEa5uyDd3Ob0ksmVeC0fP3DBGD5P+09 WiM/haD+xMCLpMMv5hlMNm7gTP5sw1Uhthjec8purNIBbQnyL8pN2XFN8X8pM6iVEZpCbY OaEEkGz63hTUepp0B+4MLWZHiCf6utsK9f2V64a5KimQxWo2DpwLCB+vlk04kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512453; a=rsa-sha256; cv=none; b=fNOVStiq18IxSK8FZQMJ5vpjFJT5SqDsHkQVjCwWxTIb1I7LJTMLgrQuprHrEZJkZEC4It H6ioEj30FlwiaF9t/3xsLs+spdzT0gH7oEURgU/91L/RHFfmgK35XtOwsqkS18+5D7xxVN yHfhyULPRH06wLUeilfBSGyQ+i83cgjIYBsRGUNewkkX8svoMqR4IuWnE25+KmKZYSPCqN dggeY6TVU+VPk40mrmawTLj7oi++78uH/1l7pjiZjHL+SQkdFS04KgzHy+XZFjo1QS2NjS PEPCrvmg4GR0gDheqS9SHQZsJMGbsQzWMwxlLT+TP6HHdfM0qEAdN/L9wt5HYA== 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=1782512453; 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=G7RCQWucg2je1wYuaYLp0XBWMr5WHjkF6AMlHNUjl5c=; b=EGYfMDOFwn64OvRF74+mYjGWCkQLCYemz0oLVs68Dh4lJ9wXxBa8gapTVdDqTdi0+AzMhy D5Nxig/SZTQLgdQJdy5xAOijTW5mfpfZeW6TdMeq9G4ygI1e+IOe8j6bncc4JJOE1rkP34 3GJzz1GcGxoRTorvyBQvqgha2f3KNGhswE1HekMWSE5hcntniJLGPsbtz0tn6AchWlvlPh krggjva3QmQeiWF+OjANU+QDvrO/ij9hidBDNmCpS2dkvlIh1eAEN+COkgCN8Bb95JJgpk beXDSQGeiiuVMAJI8QY90LybIoVtUFVo9xA7AzJwEO+U79FRs6Y4kI0IgLuYeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99d4HwbzxH5 for ; Fri, 26 Jun 2026 22:20:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2577b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 24d8b3364405 - stable/15 - kern_proc.c: disallow execve around sysctl kern.proc.rlimit 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: 24d8b3364405e5c32618c6930d4fdd8bc543a08f Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:53 +0000 Message-Id: <6a3efb45.2577b.37d97f2b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=24d8b3364405e5c32618c6930d4fdd8bc543a08f commit 24d8b3364405e5c32618c6930d4fdd8bc543a08f Author: Konstantin Belousov AuthorDate: 2026-06-16 04:30:10 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:07 +0000 kern_proc.c: disallow execve around sysctl kern.proc.rlimit (cherry picked from commit 5a91fa5a7656c99e527fe7e6f6bf6bd9e85ab589) --- sys/kern/kern_proc.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index e2a71466a273..8cf828c7360d 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2994,8 +2994,9 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) u_int namelen = arg2; struct rlimit rlim; struct proc *p; + struct thread *td; u_int which; - int flags, error; + int error; if (namelen != 2) return (EINVAL); @@ -3007,23 +3008,24 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) if (req->newptr != NULL && req->newlen != sizeof(rlim)) return (EINVAL); - flags = PGET_HOLD | PGET_NOTWEXIT; - if (req->newptr != NULL) - flags |= PGET_CANDEBUG; - else - flags |= PGET_CANSEE; - error = pget((pid_t)name[0], flags, &p); + td = curthread; + error = pget((pid_t)name[0], PGET_NOTWEXIT, &p); if (error != 0) return (error); + _PHOLD(p); + execve_block_wait(td, p); + error = req->newptr != NULL ? p_candebug(td, p) : p_cansee(td, p); + if (error != 0) + goto errout1; /* * Retrieve limit. */ if (req->oldptr != NULL) { - PROC_LOCK(p); lim_rlimit_proc(p, which, &rlim); - PROC_UNLOCK(p); } + PROC_UNLOCK(p); + error = SYSCTL_OUT(req, &rlim, sizeof(rlim)); if (error != 0) goto errout; @@ -3038,7 +3040,11 @@ sysctl_kern_proc_rlimit(SYSCTL_HANDLER_ARGS) } errout: - PRELE(p); + PROC_LOCK(p); +errout1: + _PRELE(p); + execve_unblock(td, p); + PROC_UNLOCK(p); return (error); }