From nobody Sun Jun 28 00:30:09 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 4gnr0L0F0Fz6jDMb for ; Sun, 28 Jun 2026 00:30:10 +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 4gnr0K4h3Wz3dQb for ; Sun, 28 Jun 2026 00:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782606609; 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=xuyFIlmMMGO902bDqRfAwRqH0mvHEE4la1BtUT64ffU=; b=Gq54uZz2UattL2tstgCAO89byP1TqOjIb6DehFQZhobz/yv5JLhfpq9PKmZEBA8AtJH6gL LgVx5UqwdoRAaOGpnyLWY4to8DJxyCXCXLJQzlZpp5ZsCqOf7Ecn+gGn47y37QUxEivgJQ z27NPZb/ApkAfKaBnkmnJBr2R50Yc7K/CGprLOqQglEbqRsElh3mbZ8c/4448g2CRsGuaJ uczKC+OjbhFvrZwREwWLMlebQ0hX4lFmIsrWWWXGEVRlucV7HQ3J8eYF8t3TwFb5f6BfLx WHfT7OvZi3fdcobBgJfJ0tKGvsZ+HRQYkrhKIDHHD9jwB13an4yXCRjeLAPjzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782606609; a=rsa-sha256; cv=none; b=WlMHZrNSaNLMuFNMkYwW+zE49JySlnwU6p3aVDP3DlCIh1g7dsALVu8e4WTHGgENtrZCUc LFwRmcqWHT0BopZW5FyzV7IM21uLy8R5PhW2IWjky/wU0et8OnPmxWaJhACCctQIquMJEi wXSjs74MTX5mMkPK7eOicu6UcrZfDKh9HFWumy/RiqGgw1Nc061M3tRHy2QAVxySBxxo/S 6eDnuAGZg8PYN1xIuucVQ0Y/bzcgCO0cSQ14vZEfAt7FVzbhTr0jQOml643VwvMqQCmBC/ hnDMTxAY0YfWN3MHLev0LxfS9dYsKcOoiQrz3bNDqiaK4tt1zkYSc//51Ch4jQ== 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=1782606609; 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=xuyFIlmMMGO902bDqRfAwRqH0mvHEE4la1BtUT64ffU=; b=JD/qlOKvE8ev7aGXyNVwAATUdOR1ITZf52GSOKoCjWjqZG39ZN9fRiroCVLpLvKbIhE6yt Bbqs6EYH4py19neio7MLgDNSZkFKGI+KQ9P4no8Qhee+rYOzHXLi4EYkSb+U38T/8xPExh /JAMvTypkEnRaH3VKR91LKuDbL5dxiNFoPgOmJq/B65uEIAq1HY817NNiQWqQ3Le06xA1p GPk14LJJFNZnfEThjW8iWBybO4fqNEENvilcqOI95IDYSo23OIIp+nKwlHPK1lpa/8DZBS gAscHHs+8AUCGVyk7OFAWAqF+CfaXuxoCcilG+NF1FAaYBt+h1QLGWT5WBoaXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gnr0K3Fwczn3N for ; Sun, 28 Jun 2026 00:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f045 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 00:30:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 35b95beb06ca - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 35b95beb06cab0b10a7e3a697931851315fe3dc2 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 00:30:09 +0000 Message-Id: <6a406b11.3f045.7a23c729@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=35b95beb06cab0b10a7e3a697931851315fe3dc2 commit 35b95beb06cab0b10a7e3a697931851315fe3dc2 Author: Konstantin Belousov AuthorDate: 2026-06-16 04:30:10 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 00:29:00 +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 91c9d4473d76..a722bac6185a 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -2995,8 +2995,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); @@ -3008,23 +3009,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; @@ -3039,7 +3041,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); }