From nobody Wed Sep 02 14:13:47 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 4hZl8C2pn7z6q7KY for ; Wed, 02 Sep 2026 14:13:47 +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 4hZl8C2HSlz3PRx for ; Wed, 02 Sep 2026 14:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788358427; 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=2NieFIcMXIFuRLtPmXZXj7Nqbln8RhiJTGdI7qMpoSU=; b=kPvwoWAee9KWmbsuGqDJTbDeP2cai2TMxKyyiNZcB5eTaDeHHviqd/mq1eUMzyxV4uYxGq rk3Lln0ncZVnwcAJp+a9+51BUnbPGcC86By6JZaJLlYM6hcIzu+LQRzQNiayCqMnd3E4D1 XefQ6WR5G3SxQtaQrPXS7/77BmfiSs0iUhXj7AgQmhcwUy+bgTm4XCpDzPc7UzlohkB9Cv 13dAwcwfB2QvU2NBHX42ig9WD8v/+wKHuIcpbuwGSz2mkNbLGanSIkahETx0RrQObqm6wp HknQ2ekoHf8XrdNug4uQc6CTycv+B6dLtLbsm8H/7B8TIRzPrPs3+W/t6yNw1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788358427; a=rsa-sha256; cv=none; b=PvB0N1FKIiPFnKp8sEQ4xDSJgKZvvJilJmFZ940oIP4YJYlOBePlOtwdVM37cIoPtaCAvb xG6RGYhhGtiUX93chxzVXHQDmTmKNpmW26/MDD2Mr5KSMEGrYFE0nOMNou18MjOOq+tdyY rOpMHLtz9CxQzHa8vRXicc7PpL7BTd1yoOzongXKEO0v0+IEsnC815wKECzQJWj+9D7i3p BMucv3fgdjGBxXQTzKY25yQ+RwQQVzsSYh63rPVSj317GBkMFn+pbRhG7r0IWHjkJ8OKpQ SZxrNRtmg9kyvsszBc4YxUbUqzLI3TzyrOoN6YapC1GpJEVlcOiWGBmstbENPg== 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=1788358427; 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=2NieFIcMXIFuRLtPmXZXj7Nqbln8RhiJTGdI7qMpoSU=; b=hEiuK1yd+15KptN0vYM2uum7ffp44TABGqFSC6Dx0XdA5ApY3D58UJ1NdfJj2NFIOqVbXp Gsw9CPaYryQM7f5V9yv2BXQZ4XbwOhiMy5jYCPtV1WI/s8uCVJhDQvW1Pa/qyC66B8ZUBI emjOUnznVwk0KYFVniniAJjYKXthCAQvMSeNG9iy3VtpqFtMuZFkXxa6wibku8fY1VejpG 67/KVSP8jf360ZHpvBDpoXbvTvuv4BBl9AbSobmbZIPxxzEDQqNTwkxvn2ZjySSwk+lOb2 Hdxtvxe9M/zZSdZaoKJxD+gFH+mezroEVCrchnV8Np/i8CwYxLMQ4HCT261H/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZl8C11M1znG1 for ; Wed, 02 Sep 2026 14:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20d56 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 02 Sep 2026 14:13:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: b1f63c6ab7df - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: b1f63c6ab7df2f2f9febcd72e6af2e80fcc55197 Auto-Submitted: auto-generated Date: Wed, 02 Sep 2026 14:13:47 +0000 Message-Id: <6a982f1b.20d56.21e95e77@gitrepo.freebsd.org> The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b1f63c6ab7df2f2f9febcd72e6af2e80fcc55197 commit b1f63c6ab7df2f2f9febcd72e6af2e80fcc55197 Author: Cy Schubert AuthorDate: 2026-02-11 19:30:38 +0000 Commit: Cy Schubert CommitDate: 2026-09-02 14:13:42 +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 da7b7a212035..409524aad55e 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -8550,7 +8550,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); @@ -8611,7 +8611,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 4bbb19c889bd..9dd84f045164 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil.h +++ b/sys/netpfil/ipfilter/netinet/ip_fil.h @@ -1475,7 +1475,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 a22e19db15aa..7dba00ab5b19 100644 --- a/sys/netpfil/ipfilter/netinet/ip_state.c +++ b/sys/netpfil/ipfilter/netinet/ip_state.c @@ -4922,7 +4922,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;