From nobody Sat Feb 21 16:29:09 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 4fJCHT4W1dz6SsTj for ; Sat, 21 Feb 2026 16:29:09 +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 4fJCHT3rcFz3sSR for ; Sat, 21 Feb 2026 16:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771691349; 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=nwlZl66se+k3tr8afqj+Ot3l+C+nvz4I1FsLRtZMe2E=; b=bh3eIY0hl6dUL8oWFPkTWFdrHZVrGmEDfWVNSy3mHaorDqOgsxyysFQoaPQEa3BY/85dkU gppW7jmvJzsPVwkNg1PLzsbIY+uC6BtKi41aLNdP80vCLOC09cacepx1UOsy4SsUlI0Y2K s4N9+SZdbAIN6wce496tm+80tkY7D4JAmxNmPFc9flTnNaJ+COPxJL5X29fXKMN8C0Cupt gUlEkU8iPj+1ZksOA6WMr4+GWvkToERooOoFJgKrg7vaH74qFOXlulTjdQlYyPkrAjHmUy gtb7nOkcIaSEcnoOQ4UeC7wBHFkcpvegzqZa/52IPURIfp6RW89apEVyhRuQkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771691349; a=rsa-sha256; cv=none; b=W1vothrYek4iHltv6Y9bNEWOBim55tIJYWjgqllMxy2+rdzVNpZbA3V+1Ill/B7BjJamoP gb3VooGwLsV9Qs80IFV/wvO5WNRByyal8MK2Iq6Q5e8SlTIqTam1bHWpTfMBq1Zguo+uQ/ /SW/WkzuIa8ylDdd0SSTdiak1iU+jwrt3BlF2h0uAwHpGBIrU9KBKcPljqAZ+uHL/85d1z r8qeaaIgE5bFCIArUQbn0N7JEdvWr64NSDvCkeFTSfKw1KhfGMVN3O37RYd+kw+1ZpRzYd x/7rKRz3zJxPqYAGBiCUyZfyit7SGtBZWjA6y2/WxXsRk6U18q01s83CxcL/tA== 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=1771691349; 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=nwlZl66se+k3tr8afqj+Ot3l+C+nvz4I1FsLRtZMe2E=; b=TtpCpacUQkSum7wgFbM96DVVkZ35w1MgpehQ9jQ4fW/R+K4YyM94z7MVEPacCExb2z6XQ8 dKzJftYeZfqvpV0xqJFCgLxc5Qa+pIrbzf6elEdD/Lc+T3lyQwbfeA7TO/u/tZd4NHFImA sT9Nrl39FiRf3Hq1A7le4bxo2c/bhQDOtusGzX1TWrVtVGljvCn2Gn5CY3I0X1qhdUI5en gPly8fOOHLzK8HfID/JdqUUcUVO+gzZXlbsfjDpLDq4bRLkS+CuUuryCo9xfdc7e5wV95Y NEsOqevqe/xWS6cejyoZ1/I8gnMnj02XRr1BJxl3IIsM/9CUhDNxvhndyzCGoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJCHT3JH2z1LKQ for ; Sat, 21 Feb 2026 16:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32582 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 16:29:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0fa6ce255661 - main - sysctl: Avoid calling priv_check() unnecessarily 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 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/main X-Git-Reftype: branch X-Git-Commit: 0fa6ce255661acc984a45deaf2d710149b957ce6 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 16:29:09 +0000 Message-Id: <6999dd55.32582.5e35ef21@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0fa6ce255661acc984a45deaf2d710149b957ce6 commit 0fa6ce255661acc984a45deaf2d710149b957ce6 Author: Mark Johnston AuthorDate: 2026-02-21 16:16:32 +0000 Commit: Mark Johnston CommitDate: 2026-02-21 16:16:32 +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 --- 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); }