From nobody Thu Oct 01 15:20:22 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 4hwbFl4H9tz6v5GK for ; Thu, 01 Oct 2026 15:20:27 +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 4hwbFl2n7Nz4Kh0 for ; Thu, 01 Oct 2026 15:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790868027; 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=bL81Fe4Hdt2BP/ELCcBsURGPls7LiCJLIhcAomxsdno=; b=EQ6zUftQE1JkE5KUnzojVhv3T6HdyfMFESvJ/y63xCD5Engilp8xkydw1yIb5t/DPCyBDv Q4DgLEnMTVBZNLUqDU2RjV6XrxngsCLBaG/XVcdVq8VPYYzG1dUXCcySLP8CnNtgUrPtD9 Zdvbci4dtgzOailX62FZB05sttJW530EY6KHCTa66HoEq+P3CEdWZZZo0zaTxsujKZM/rI TYFiw0SS1Q595OXTQJwRNEMIl2L+/krb6dHX9tFGMl+znF1/18JymRiFAsSxBtgkXPOUJL 2bAO8/L7T2ffurgmEhTWNF+x+MLvrustn98LpPSTV/1jMj79GL0yksXlFRYmwQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790868027; b=ktzHb+lrj03kE5ZBC9SO+7JofjUNllmGdvzPbqI0GY6oxmjMkKXLrGHvcX0Y2b9+beXWKg WEfFjFYRQFBAmPmms5ABoTrR8dlMN6aaYK5AlEhS02ayUERXzY8AkVl0fQfCxDUuU9Eb95 YONFSX3h6eqy4XQ8sscxrLmDfzZkyKESzBZlk7Ze2maA2GW1I9Mv14sstUKeSViurAPWqa RhFyWP2ZxgwYpVAQFnNGEkhXkkTUXC4RL6swWiYBpkTcG1V4lIHaCyXmywM9l7n4tyByN6 Jru0w1n0C6VjNLUMaYXIm6Z9FX4tndyGXJmVi88MCW+wzixTglzHJn0yLmrq/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790868027; 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=bL81Fe4Hdt2BP/ELCcBsURGPls7LiCJLIhcAomxsdno=; b=SEqAKO3GeZSx1VujLj8/iC1zsjlGIUZRlox7Sl9j/NYwmT1pTnYrEP/nEzMLxc3/pPvSAK 1dZvynGWjiCvZpS2uDdLByqcFg/qI2lD35MuHOv+oDFeka4g+VM1hX8jvTP25hQmQyKs8T V5L2mvVWzckL9KsOJMOO5AtWe6qf/lL39+64vCav7actmaKJldDUyKsZTodpyP/EunU2CL aGzEMw1gKp82iTlhZ40GdViYDeMtImfZuK93IWhno20rFArsWOmQNf3ZjwzfJAyXIHnwRK 97lx1TrFLAHMRBXsCxzEP3hkMWWgEyFYHujHFCuM09YyyuD+wTgPmaX3ZZLoAA== 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 4hwbFl1rMzzf68 for ; Thu, 01 Oct 2026 15:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c69e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 15:20:22 +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: 62dfa6c0842e - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 62dfa6c0842e8f7ca67ca377280e2b6793614b62 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 15:20:22 +0000 Message-Id: <6abe7a36.3c69e.7d267e69@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=62dfa6c0842e8f7ca67ca377280e2b6793614b62 commit 62dfa6c0842e8f7ca67ca377280e2b6793614b62 Author: Andrew Griffiths AuthorDate: 2026-09-16 13:04:46 +0000 Commit: Mark Johnston CommitDate: 2026-10-01 13:42:28 +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 bf95c008e2f2..5047a723fe01 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; }