From nobody Wed Sep 02 14:13:27 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 4hZl7x1lQ9z6q70M for ; Wed, 02 Sep 2026 14:13:33 +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 4hZl7x16Zxz3Nmn for ; Wed, 02 Sep 2026 14:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788358413; 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=RPtsfrHpOhLxhUOQbDKMyNOdoBgSSbbDhhKU7HsK9VqoZFIgD1MaC5zz81mSZfo4jR0VD+ co8LWCKVKyhesmfulNm86VQHkPFhE9f/xlNXy3RoS0wBXc7CUYRTzvhmvB2Qv6dutF+p+L gGGS3Luq014aLqVKZlz+zn5OeNeGc9liNNrF5/+vPNf49lmuvhYQBcuRFVhcwEUayZD14X cuO/U7xAOU8OfsSGekIBluKsrToKDDsFdvd+N0YRUwv08ad73xVPQq402c5CurSBxz16Ji oNLA8j9T4lF2jHbkaUSv4+q3WaAAw4LtzSn3Cg8LLaaFiDaZgknSLkoxKexiJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788358413; a=rsa-sha256; cv=none; b=VXdtK7fWM13ww9urX7KNjZUj7IWDARRDwoFWrEZhyTOWU7ooRVwMRDHSNwFw+063QWGbyh kRWlRd+949lM7I4Url3PeF534YgWn571q7jaD5mhEiNQBzBcWYZpvmJy4RHFY5mA4g1a/d TKLyfoMN8ruQmBsqHr1LWyA3hLkXmnOMHByNWSnbhCTbX9l6Bid/T2rVvMYUxdQm+mJ0o5 BiwXBZce9fIDBTXEK3pZ7X1ib/JUg0LoQaInm2UCZZmZCYuRS1WPTLIdxcfTQ91D5t8P8O IFYI1Qq0oNN8+17kFbs1z1qROdMfwqfW59+00FWLDDDWyP9+evxSXIG3NL3xaA== 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=1788358413; 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=p7N4ANTgtB065Fr1nCPtisVbA//bBC1V8QFWEHqNeTfvA3FfO/dY7RjkhVGDiHJLSsn447 IS5EIfBdBEIjuuaSj6NJVUKA+KhzQjxfy0+8HoVvjb7cF5HgR6SJEn9zck2awEr9z0Pb8R iAxgWmbSFw3CFerPLC3JU4qE0sjGYkjDZwJ8Ru9snoet5bJLIhZFfjJVel0mBkwmAt33Cj Wm0EZP7B/xPu4tT2VCTj7nBAN/jZWXMo4lKIdaXruOY7RMI8twFc32gnfEDqjBkAZoJauI 1jtqSIMQsU78ka/HGf0eRDWxNLr5wPp/nQOHNiKCGWLu1ZYgr6XDkIzAnATUvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZl7w6x82znFy for ; Wed, 02 Sep 2026 14:13:32 +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: 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: 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;