From nobody Tue Mar 31 15:59:04 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 4flXqF48y9z6WFLk for ; Tue, 31 Mar 2026 15:59:05 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flXqD578vz3h6B for ; Tue, 31 Mar 2026 15:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972744; 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=EoZbmWczbxL9+tXFo+790eYZstjjqJMRL4PS3XWuCS0=; b=E6Qi6S0LMTLKnpPWbMePwm1Ht1QsDiEFJkvjbQkhSZ26KaIOAuU8YBr7570YjlkZZqkkr3 injo6J4GXprolhX2ojI1RLudiCVMsgkAU1UCNC2KHmbpcOv2Tyt1p9vbvy4n3WpRGxVm+F 2KIl8e4juLxS08fZ5jP/PP99UNI4WMng5ZJW6z/E6Ghj9G1Z3D73waD8Pd8gsIQc16H3F+ zDa0F3JnJyKKKOcdlx/Fnq9GS2KA5heermqIigY6ImGzK9ax72h6BzLsdas6dMhe4CGtGw an5L8xzDeXOr4iJW3tknNq3FKVz9x8cVIjsHHxRNzT/P2/K9BLtS9lZmNYpYuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774972744; a=rsa-sha256; cv=none; b=a2jFcMx2KdqImLjRnwUW6CAKej35kAz1bnluvXauE9WvvElWl+Q9akEmXdcwcWdkBKAEkS d4/5gJpog3zHEkPC3O5UZFiCSC8B6BUvL5MLIk1716C74f5o1PkL0RfP+NMQJzltuh2faq bPwQP96uNn0EhF5IHzvSWMvd1ea7VDGneuHZmRTvzLgl9thPWRHTP9FU74T1Cn9npBhJjp t+843DjkLLDmGBljJrplPEf8PGIA4WgDpRRLF3TjEbBi0Jv+bymC5DO3sjHA7H5clUqp6f gKm9/gOQuIy5DRYnQRGclntkRUnQufnaYQQjxK6ayRBqCzSoWE+HMqn1DypmLg== 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=1774972744; 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=EoZbmWczbxL9+tXFo+790eYZstjjqJMRL4PS3XWuCS0=; b=I2zDUCLXwwruAPQE5zxjlU0GxaAoPH9aA7MVNC7eXE1UpCiQbLUjWQkSR2nT4RBeE0OlK9 AWP94lloDB1tnFJGrLLCkDx/SMbd6U+B931nUMUdH/6/smFPDxWbd3DDGd+rRY+NqZuPNI 3Q4QEmmaQKw9SJRk25TNC5naOBEO99qJhTbKikSLIa07MdY+6KilFY4cH5XwYKmKHG/YoP 0hCYthzMDlj+U6UZ3gl5t/Z0Hp9QPI38nU4tm13nxtsEl6zZ76dtS/+jOVSPmDGiHz1m1P 5KcZu8mrhNs5JTG4rcKb/ycysfyx5s0dqnBCx18G4yo6WFDCqfkyr0P1QllzAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flXqD3RX6zcQd for ; Tue, 31 Mar 2026 15:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a125 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 15:59:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 132d9d5df64d - stable/15 - sysctl: Avoid calling priv_check() unnecessarily 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 132d9d5df64d440467d5a20cf7082a761c80bb1e Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 15:59:04 +0000 Message-Id: <69cbef48.3a125.15dfaf32@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=132d9d5df64d440467d5a20cf7082a761c80bb1e commit 132d9d5df64d440467d5a20cf7082a761c80bb1e Author: Mark Johnston AuthorDate: 2026-02-21 16:16:32 +0000 Commit: Mark Johnston CommitDate: 2026-03-31 15:57:29 +0000 sysctl: Avoid calling priv_check() unnecessarily After commit 7d1d9cc440f80 we only serialize large sysctl requests for non-root users, but we should avoid calling priv_check() unless the request actually is large, as that's not the common case. In particular, priv_check() might not be cheap to evaluate if MAC hooks are installed. Reviewed by: olce, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D55377 (cherry picked from commit 0fa6ce255661acc984a45deaf2d710149b957ce6) --- sys/kern/kern_sysctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index be0acb0a4a55..4adbd71fae24 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -2573,8 +2573,8 @@ userland_sysctl(struct thread *td, int *name, u_int namelen, void *old, ktrsysctl(name, namelen); #endif memlocked = false; - if (priv_check(td, PRIV_SYSCTL_MEMLOCK) != 0 && - req.oldptr != NULL && req.oldlen > 4 * PAGE_SIZE) { + if (req.oldptr != NULL && req.oldlen > 4 * PAGE_SIZE && + priv_check(td, PRIV_SYSCTL_MEMLOCK) != 0) { memlocked = true; sx_xlock(&sysctlmemlock); }