From nobody Fri Jun 26 22:20:54 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 4gn99g2b4Gz6j2cH for ; Fri, 26 Jun 2026 22:20:55 +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 4gn99f5gWTz3mRt for ; Fri, 26 Jun 2026 22:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512454; 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=z1EsVidCgRqEJLm7zkTBjAhEb9WSgUiFuKw925Whoik=; b=WjlHZpsyTLi09ZzxGt35hxb2TCAgLhEuhQCtEAkFlB1TMXoEa45j4TG76CBf2Js5MAf45B 2O8CM4QCEnlRqdEHhabZeXrrkM+5CzJpNBihrfGvFLiSh6vWNvUJSWRyxMbwzuPcXxRnry OODsirl7aX2o+6FguaRVqCblw7dp4vWJJ0ufO28dd+y8fHbG9m/bB4eopVbqWJiUbKolTH JYSgWezhAi3OvAgFzBVXREC4vjyyCd7EaZ2FmmsOdZlGzf1yBGtrYu7l8OZmk4vDGmQSe2 khBSqjYkzI3XJ83PLf10R+upg+cjZ7v5gZiLZe1glxbYLqRupm5IH37s2hDViQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512454; a=rsa-sha256; cv=none; b=VsJ7GY97kb9+7j6oM4OxzLW7pNybzu9eZuacV1tW4s6wkmE8p/J+lMJXFN2br1E6r4rr9r 9UYcDCzq2+dg4rAjX0WSWJKPsN7IuTvREC3qpqmV+fZmztqjOH28VRkW7yDjTEaNrMZIQ4 WkFE/2ZsC2Yvr5ISARlv5yn8GT8wQTBK5X3cIBT82yklRADe5Xt5LljsRsNsMDq7a6F8Ic mJU0ZAqp0dXf+HtsgHEEL0RdnR8Ju9LCpcX5WiNn1b9apNeSE+W0GChVBZmDP5OF4amvf7 oyWhoka6gTrWJoQgpTWeCbDPATyupNtxHWmwAC4j0lNnjaAgHAd+ZuejTDcCEw== 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=1782512454; 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=z1EsVidCgRqEJLm7zkTBjAhEb9WSgUiFuKw925Whoik=; b=XRE3d5ygXOQOwVRishlUySPWGJfVAigWKlLnEHXzfIn6idYD8CtsdF7P8drJsD3mAUKw5R YpFNaH+RjPkVWt2xbMks6Zua3JMMGeYskXjEKdAnRGEse6SQjaHhCO+3t/aVoLR8lCZ0go QMO7cq6+dW/1k0xu8587wR79IwsLd5C+9LJN6XNT0L8rDEQjmLdFnPDYCNTCPqqqihc3TD 7WJoQulaETZOCcVpTav/JGzz74qJ8HflSHV5CTwY7EbRb/D/ABdNqokxzAztefXLw8TPxy qO5LhY0xGK38j4rptHTwxQD6AMWkXfSb0LcOO3WpsH4Oj/fyXOcIKNNEngWf+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99f4kJtzww1 for ; Fri, 26 Jun 2026 22:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2732a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d172933cf69f - stable/15 - kern_event: block the target process from execing for sysctl kern.proc.kqueue 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: d172933cf69fb4dc58e07261653481a33cdf1da0 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:54 +0000 Message-Id: <6a3efb46.2732a.7cff5cd0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d172933cf69fb4dc58e07261653481a33cdf1da0 commit d172933cf69fb4dc58e07261653481a33cdf1da0 Author: Konstantin Belousov AuthorDate: 2026-06-16 03:48:29 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:08 +0000 kern_event: block the target process from execing for sysctl kern.proc.kqueue (cherry picked from commit 79b384bd8fdff4869ce4799edb0342ff5c25b6fa) --- sys/kern/kern_event.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 8c7a0949f024..01bd22fbefd1 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -3381,10 +3382,6 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) if ((u_int)arg2 > 2 || (u_int)arg2 == 0) return (EINVAL); - error = pget((pid_t)name[0], PGET_HOLD | PGET_CANDEBUG, &p); - if (error != 0) - return (error); - td = curthread; #ifdef COMPAT_FREEBSD32 compat32 = SV_CURPROC_FLAG(SV_ILP32); @@ -3392,6 +3389,17 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) compat32 = false; #endif + error = pget((pid_t)name[0], PGET_NOTWEXIT, &p); + if (error != 0) + return (error); + + _PHOLD(p); + execve_block_wait(td, p); + error = p_candebug(td, p); + if (error != 0) + goto out1; + PROC_UNLOCK(p); + s = sbuf_new_for_sysctl(&sm, NULL, 0, req); if (s == NULL) { error = ENOMEM; @@ -3412,7 +3420,11 @@ sysctl_kern_proc_kqueue(SYSCTL_HANDLER_ARGS) sbuf_delete(s); out: - PRELE(p); + PROC_LOCK(p); +out1: + execve_unblock(td, p); + _PRELE(p); + PROC_UNLOCK(p); return (error); }