From nobody Wed Sep 02 14:13:27 2026 X-Original-To: dev-commits-src-branches@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 4hZl7r0wCHz6q7GQ for ; Wed, 02 Sep 2026 14:13:28 +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 4hZl7r0Pspz3Nxm for ; Wed, 02 Sep 2026 14:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788358408; 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=jEfWjj1RUc33B2v5RtC05QEMIwe3E4W/GlLHS/G5zAM=; b=J60zWK4wDfCVvy6bzwE+EaBx7ogkbbLeU4t36iFBABwoTSF9lidzWtAjN1M1LsvQ66DWAq PLeU6U1qz04jnEqSR1A+V9+W+sqc0RGuSAUSy+/DhzRBEuNQFnymK80H4xkeT5OG6pW2ik tKtBaCqEkTN+4fhCE0vOO2r5uSwIX75b2Ucarv/hn8kNA2TvrmcIMA9ZMUu9zB5IDQ69Tz 2pJtMohmmnTj9TjgHLVETZjWPmcMQBWW3rqIABkljxY9VMuJRU5j4mUH43fKJ8b13GSEHr HgLidVHqCS9G69yOrdGdgutKE7OOSikegEeJiGFCtAbrEea6ksyRSYTJrLVnQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788358408; a=rsa-sha256; cv=none; b=XrQXep041TtWZO0+/WK4hqVaGuzzs+F0Hb44FF2g2uoCY+DODPKzaa2ffRMaUe9Z7dBLQB 08OLuK1KX/X6Rvu5KLl03XOyu9Y7n/boOdLJ10ohaUyXE84Rf0JG6r6uRs55oMMOeg6sZ2 aSGrkcyU8hjQaIbpCt90oQsmJ1hcD9RGw9J+7WqCB8Z7IWILFBnKwoNUgmcEBemKFxiVM4 vXgIFXOgbq7bWj0wKLAFhIgYSRWfH2XdFav1XZkqtjLCHMVeLliziIen1b8CfChvDDDicS Z60V6eHxwsxYw00vP1n3tlo3a42nQsuK+EqN0ixjA1/BqafwLw53l5GjgCkomg== 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=1788358408; 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=jEfWjj1RUc33B2v5RtC05QEMIwe3E4W/GlLHS/G5zAM=; b=Mg4utR07UMzoYh2IlcFjvGs92QuVW7WZlXEzZBQW5sOMSeNaIWvb0EuTKJzp7d0B5oSmxA 7RZyz2M6yRrTFEeDdsnqXPIhdKah9XZpKw0cUZQM/b8bz3pM19iiFFXYHhisp+AYNzBvUG H87rhWD5gPjgrpdYv45WxCGO+ZFZe82H/e3wQbcFo0BXvkN0ibVJvjlhbputTsBM7Roj/n iRfrPjhzPSk7UOunKDud3UmjwxYj47rCT/3d4PHO+OKIsZy+ZQh0w6eAAIHOU3knGZLve1 Ls8dVTmXIOUGot2rVnVxRkyGxPKdqfY5QM+651tC8meB3/iITzBHQCsbeYADwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZl7q5sYvzmlx for ; Wed, 02 Sep 2026 14:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2071d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 02 Sep 2026 14:13:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e2315ce0b6df - stable/15 - ipfilter: Avoid negative array indicies List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e2315ce0b6df8a0347e32e2c8b6f02a457b564da Auto-Submitted: auto-generated Date: Wed, 02 Sep 2026 14:13:27 +0000 Message-Id: <6a982f07.2071d.6efdbeea@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e2315ce0b6df8a0347e32e2c8b6f02a457b564da commit e2315ce0b6df8a0347e32e2c8b6f02a457b564da Author: Cy Schubert AuthorDate: 2026-02-11 19:30:38 +0000 Commit: Cy Schubert CommitDate: 2026-09-02 14:13:13 +0000 ipfilter: Avoid negative array indicies Array indices must always be posive. We avoid this by making each index unsigned. This mitigates out-of-bounds reads and writes. Reported by: Ilja Van Sprundel Reviewed by: glebius Differential revision: https://reviews.freebsd.org/D55260 (cherry picked from commit 3fdbd8a07a2dcb8fe3cec19fc59ef064453e4755) --- sys/netpfil/ipfilter/netinet/fil.c | 4 ++-- sys/netpfil/ipfilter/netinet/ip_fil.h | 2 +- sys/netpfil/ipfilter/netinet/ip_state.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index 6e71891581cf..8d6a91395cb4 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -8546,7 +8546,7 @@ ipf_matcharray_load(ipf_main_softc_t *softc, caddr_t data, ipfobj_t *objp, int ipf_matcharray_verify(int *array, int arraysize) { - int i, nelem, maxidx; + u_int i, nelem, maxidx; ipfexp_t *e; nelem = arraysize / sizeof(*array); @@ -8607,7 +8607,7 @@ ipf_matcharray_verify(int *array, int arraysize) static int ipf_fr_matcharray(fr_info_t *fin, int *array) { - int i, n, *x, rv, p; + u_int i, n, *x, rv, p; ipfexp_t *e; rv = 0; diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h index 24d4f9695322..e63dee32818a 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil.h +++ b/sys/netpfil/ipfilter/netinet/ip_fil.h @@ -1473,7 +1473,7 @@ typedef struct ipfexp { int ipfe_cmd; int ipfe_not; int ipfe_narg; - int ipfe_size; + u_int ipfe_size; int ipfe_arg0[1]; } ipfexp_t; diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c index 774e04b36fd4..d5a04e326321 100644 --- a/sys/netpfil/ipfilter/netinet/ip_state.c +++ b/sys/netpfil/ipfilter/netinet/ip_state.c @@ -4918,7 +4918,7 @@ ipf_state_matchflush(ipf_main_softc_t *softc, caddr_t data) static int ipf_state_matcharray(ipstate_t *state, int *array, u_long ticks) { - int i, n, *x, rv, p; + u_int i, n, *x, rv, p; ipfexp_t *e; rv = 0;