From nobody Thu Oct 01 16:12:30 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 4hwcPv63tlz6vC8S for ; Thu, 01 Oct 2026 16:12:35 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hwcPv4JDyz4T01 for ; Thu, 01 Oct 2026 16:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790871155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJMZBZXgvTjG5ltIqsr305U8cYfDyVgKXxEuCiJHIRQ=; b=JaC63ScTfyOxuTZvbyc8EKaJpmB6CKEyvZDB5ifvJa/e9DXeQFRBWrJJmfCGnUSicFclDP EjPiIsB5ItouwyjrVg86RMHC7uQe7mCPVPp6+6NONKohvm+Q0BgCOPtUpvA0/8ga+dma2q 62FBE1ZZS/XtuVh2WzeMWGbdkJRisruURSA9fO+vCAv/w7DLpBjY3poyYFieNIVPvAacKH BLBEqyNc4RfFUwpCHen3DC8uBWo+W9g9pLFWGHY93WrAWyV5Xsq05V2xgUBrxumNtc5mWj +DN3lxnqA42XoyxcE4STaJ5lInCk2OFWgzs2kJ46+km0glBhVkxQpMd2T5gykA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790871155; b=UuzCuKd1T8IbUs6AlWZBlJDB7VVFU2r6/vs8tG7PRGsH4e4i9U8haPKR1bj6jhFmhq+o3r C3un/SZVCRQVqJDSnGNTjZHj0M9OGGySupTrFNocEO1doKTUNKePgFZQu8WpHhoYmo/sGj XbrS0ZDLku3pK/AAaYBOgM1olNgVkoiTwoAyehzLODrcCNvoZtySxMUhiLjkby+QNdmwgD kgOmaNN36U0g50Dfn6KdyVGoKFlcfIlMF3VeaSxDYqOSCmf0kuaIdxtaGwIYZCIqZcbFYQ 0IheY/tizgY3EPD5+7ogSALkeETwpbyBWudFppE42A9JYISfNvaXq72CISvqNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790871155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qJMZBZXgvTjG5ltIqsr305U8cYfDyVgKXxEuCiJHIRQ=; b=QIueowlHiwPhZhVk2PRrtuFofjKs7jpA2fWgnxTXlOzAHpG4s7zuBuJjz171CAF+5AW6Xm kahjNpNEg9oO/P2hpHwOY4IObkD6AmsxU7dkgrQCabbgjltcZaI9QIUpqw7EuVIY4QeVKK 35E/L0xTRXHLNIDyNTiVtZAT8+b+AGNZLnp8NzmTgPbXyDbuMsvew8dzbKtt1nDkbUXYJf jzv9v0p5EhCQKZIt2fgYOGckj6RpnygcOf4SHTrp1qY83b6tilKlnGYY+17hqgeLmG7UpN AIXiMSZeUqTdr2/nej1A3jOAO4ynCpc12DD8zjmxVcGPEQ/4bRITyJCGp9KTNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hwcPv3MNzzgL5 for ; Thu, 01 Oct 2026 16:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 412ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 16:12:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Griffiths From: Mark Johnston Subject: git: 3be409a395e5 - stable/14 - mac_bsdextended: reject negative rule indices in sysctl_rule() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3be409a395e503f03e6ee35eec112038b1b722b8 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 16:12:30 +0000 Message-Id: <6abe866e.412ca.5b0b0653@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3be409a395e503f03e6ee35eec112038b1b722b8 commit 3be409a395e503f03e6ee35eec112038b1b722b8 Author: Andrew Griffiths AuthorDate: 2026-09-16 13:04:46 +0000 Commit: Mark Johnston CommitDate: 2026-10-01 13:42:36 +0000 mac_bsdextended: reject negative rule indices in sysctl_rule() The security.mac.bsdextended.rules. node handler takes N as `index = name[0]` (a signed int) and only checks `index >= MAC_BSDEXTENDED_MAXRULES`. A negative index is caught on the read branch, but the write-only add and delete branches proceed to `rules[index]` unconditionally. Reject `index < 0` alongside the existing upper-bound check. Submitted by calif.io for the OpenAI Patch The Planet program Signed-off-by: Andrew Griffiths Reviewed by: markj MFC after: 2 weeks (cherry picked from commit 5d0b87669a91244e330a35fc973e6c60f92f6d1f) --- sys/security/mac_bsdextended/mac_bsdextended.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c index 8a6549214380..588947cac575 100644 --- a/sys/security/mac_bsdextended/mac_bsdextended.c +++ b/sys/security/mac_bsdextended/mac_bsdextended.c @@ -143,7 +143,7 @@ sysctl_rule(SYSCTL_HANDLER_ARGS) if (namelen != 1) return (EINVAL); index = name[0]; - if (index >= MAC_BSDEXTENDED_MAXRULES) + if (index < 0 || index >= MAC_BSDEXTENDED_MAXRULES) return (ENOENT); ruleptr = NULL; @@ -157,7 +157,7 @@ sysctl_rule(SYSCTL_HANDLER_ARGS) mtx_lock(&ugidfw_mtx); if (req->oldptr) { - if (index < 0 || index > rule_slots + 1) { + if (index > rule_slots + 1) { error = ENOENT; goto out; }