From nobody Wed Feb 19 10:41:45 2025 X-Original-To: dev-commits-src-main@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 4YyXy14zdJz5p9jX; Wed, 19 Feb 2025 10:41:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YyXy123WSz3lm2; Wed, 19 Feb 2025 10:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739961705; 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=NwpPII5AIZ1UQ+z+k/OS44qCYBy3GX/rkqq0HC/x2hs=; b=pd19/9U9kRskgu5P62iyjwsaDmyI6UNH+ExfVo32E2UfVNYuU05qx+lye/ddnp/gBMxKb8 q4plrqbeR0uBg4+P4utKgCxVQhsuuQbLs9qgi8NB6uWOoHqwHpQr58AjvOeqSld6cENhnQ POSqVznA3uic11EG6zq5aKYE0/RtSybeuV9rNkonCNm8M9jHsvhq+o7XbawknwUXkYRVvS GUCtdMygIr2i8gey9D27a/XukaYtjk6eQd1/i5vaLqabL20N03u4uIudyc8ZKpAgLEQ0IM dsnOfoR6HeTSWTmyt9cR4eYqPPkGQedwLPBoPldZKdh3mQ72Kdl7jylfFnJDrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739961705; a=rsa-sha256; cv=none; b=I2K87rsvkPjmdaTn9H2LQFbGb2KyaHHBA5JJg0E4QBrgh59jqEpRVqFZu2xBMXe0aRDbnW cAIqpJnQC4j5mQ2Ih/A9lso6eaa0ICSk+/xPUN7+LMyN9p+RbZeo/c4tfnXIk+NxagKILx ntDiuaYyzpy+kZxaDY+EOHZuECG9ViYjtVNwXXeMJwAnP7rKnmydZSrkXZsaLi8i+hsEQ6 6tveL8ORZZvb25sNaOBHl2y/KLL3VyPwzOb8iWW/iwovCdiap1AfaFjOZEEyhDyzWZb+yL RuTemqvPrkHa25KsOd4qjcksobGGoxMUrPo+d9LFGafX5JWDe0D2nJrV2vrq1g== 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=1739961705; 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=NwpPII5AIZ1UQ+z+k/OS44qCYBy3GX/rkqq0HC/x2hs=; b=dj1XMajwU/+8z17g71XtSrh/DOe7BRUW/1awOoHeHv2ezcypw2gyAoLyzVCKNiFQ8LR5A8 yj2G4U4kgXs1GHhRxikEZ2KoKZJc8Yy/3+iZHP8IESBdS30ln3uXzzPvb8h3Y7Nl1T9+IB kqwG/lS65AWe1cYfHajR823wlFltvj+54M+CDQ/EOfrndbXbaWpRSO5Qn3tNKE0ddhOEiI JDdFz0lZb1f2hBzYJ5VcooT4lKucCFEE4WQeoKSIt5A7dhJR1Xy9LqYLCdFznps/oceSUt Vye8Pvt9MXXjzHYYUBrm2v/Lt5bMP9cKJm2zvjHXae/DCdNhWq85FEgIx7J7Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YyXy11V6Gz12M2; Wed, 19 Feb 2025 10:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51JAfjYk035543; Wed, 19 Feb 2025 10:41:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JAfjUi035540; Wed, 19 Feb 2025 10:41:45 GMT (envelope-from git) Date: Wed, 19 Feb 2025 10:41:45 GMT Message-Id: <202502191041.51JAfjUi035540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: da64fc8609d5 - main - pflog: ensure we can't read outside V_pflogifs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da64fc8609d53e3b72529c32b76bf1c29bb48e23 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=da64fc8609d53e3b72529c32b76bf1c29bb48e23 commit da64fc8609d53e3b72529c32b76bf1c29bb48e23 Author: Kristof Provost AuthorDate: 2025-02-14 08:07:02 +0000 Commit: Kristof Provost CommitDate: 2025-02-19 10:41:10 +0000 pflog: ensure we can't read outside V_pflogifs Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/if_pflog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c index 7c9baaeaba76..016ff96b02b4 100644 --- a/sys/netpfil/pf/if_pflog.c +++ b/sys/netpfil/pf/if_pflog.c @@ -251,6 +251,9 @@ pflog_packet(uint8_t action, u_int8_t reason, if (rm == NULL || pd == NULL) return (1); + if (rm->logif > V_npflogifs) + return (0); + ifn = V_pflogifs[rm->logif]; if (ifn == NULL || !bpf_peers_present(ifn->if_bpf)) return (0);