From nobody Wed May 20 15:34:53 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 4gLFwG1H9Bz6dyJK for ; Wed, 20 May 2026 15:34:54 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gLFwF5j6xz3nYk for ; Wed, 20 May 2026 15:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779291293; 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=4itdBTt6crRW7NbWzNmGj1Hwj4EWWhPqy9TZ3LHCfcI=; b=Lbc3NIn56bQ2lep0+PCV3dKPP9KV4CeytJlibaVQCtcUt7g/RwO3yjwl6kLU6EUdvYH723 jam2iwl1F9QxpRR9P+C8RLOevbetT0dVDqsd5AecpNHBOa9EWRAzLdZOq6LoGKq+HuOKH6 D81o86Bt/6MB3UcI5bcluy0oWrS6YSe+9hN6NXvtXPmuSwrtnHvYuXaF8cvt+t6lcU+Xfd 4evFvm+C1kCjvmrZ+F/AUcswfi3RWPgiGHkw8ZUvCAmgvkv8bgGbVpsQpVRST5D1MhD6j3 JNqRGL4XzxBzeGPr7pQ422H7yx0IzU7A7ljaGwymEHHUE3iNqlmV0qz0JSgm8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779291293; a=rsa-sha256; cv=none; b=bRmZir5tuMdAkqMRYWH861OtHktMxDQJhzmZ+SmWJTmb5N8TaOJ3Ru2s3oB1nn2hUFDf3z 4R2O473ElBBBgDlOD4J9jTz0Zc9D9dJZOPbQOQQjsDo1XjBIExrmjiS/YJQONyvfOYh9uC 9VO9XMXRuvbI5Dz7QBcsCR2oKGXziY/uChwwIgneiz67vzqONSlFlV2TjvlsSUGR9XFx+O 1fSh8USEK7qYrzcVQTqQgWk+j0w+CW1iLXn3OawhemIuJqmyNGOyd8uUWPDUTgiMHhVodR 7Ng5+mghRZNR4r5BdPtCYgqr1eyRQz8zGIX7iiti2OMY7bG0J6P340xEI3wL3w== 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=1779291293; 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=4itdBTt6crRW7NbWzNmGj1Hwj4EWWhPqy9TZ3LHCfcI=; b=FDAC2U4sga7h+eL9y//l8VC0GERxWA7W2bgafFkHdtArcVOZE4udAh9qYFn9ch7YjwOXM/ v80hbcfaw8JbTqWTBppNQrc30yrccpPkLMln63BQTs6Ex2xkgRc8qQlOyxGktb2VUVeNCn xmjASH79U6ByLD4Zft5SDwjP4j0kVt9TJp/IK7t+ct1FyDHWOwkfcZP2Ruhmw/hJBKjH4c tav1FOYslYt+ychyTyeOWCBp8vf6PLS4hV0v1xWvN0eAnHc3JbZlMtstXrEpepEgIwIh2n 2gBCBzcM+2gF4FPl1RQz9Vcdf//lKXUPxGyomeoQedLnVaAm+pfFFmkpbskR5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLFwF3KVyz16j5 for ; Wed, 20 May 2026 15:34:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46028 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 20 May 2026 15:34:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Teddy Engel From: Cy Schubert Subject: git: 68ed81631afa - main - ipfilter: Add NULL check for fin_dp in ICMP packet handlers 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/main X-Git-Reftype: branch X-Git-Commit: 68ed81631afa20c07883f7f60343f6da8397ee41 Auto-Submitted: auto-generated Date: Wed, 20 May 2026 15:34:53 +0000 Message-Id: <6a0dd49d.46028.387f48d6@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=68ed81631afa20c07883f7f60343f6da8397ee41 commit 68ed81631afa20c07883f7f60343f6da8397ee41 Author: Teddy Engel AuthorDate: 2026-05-19 21:36:15 +0000 Commit: Cy Schubert CommitDate: 2026-05-20 15:33:43 +0000 ipfilter: Add NULL check for fin_dp in ICMP packet handlers Add NULL checks for fin->fin_dp in ipf_pr_icmp6() and ipf_pr_icmp() before dereferencing. When processing packets with IPv6 extension headers, ipf_pr_pullup() can succeed but fin->fin_dp may still be NULL due to extension header processing leaving insufficient data for the protocol header. PR: 288333 MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/2214 Signed-off-by: Teddy Engel --- sys/netpfil/ipfilter/netinet/fil.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index cabc6c350981..4174fdcc5f58 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -890,6 +890,8 @@ ipf_pr_icmp6(fr_info_t *fin) ip6_t *ip6; icmp6 = fin->fin_dp; + if (icmp6 == NULL) + return; fin->fin_data[0] = *(u_short *)icmp6; @@ -1198,6 +1200,8 @@ ipf_pr_icmp(fr_info_t *fin) } icmp = fin->fin_dp; + if (icmp == NULL) + return; fin->fin_data[0] = *(u_short *)icmp; fin->fin_data[1] = icmp->icmp_id;