netfilter: nft_exthdr: check for IPv6 packet before further processing
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v2 1/2 netfilter: nft_exthdr: check for IPv6 packet before further processing
ipv6_find_hdr() does not validate that this is an IPv6 packet. Add a sanity check for calling ipv6_find_hdr() to make sure an IPv6 packet is passed for parsing.
Fixes 96518518cc41 ("netfilter: add nftables")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: fix kbuild report.
net/netfilter/nft_exthdr.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nft_exthdr.c +3 -0
@@ -42,6 +42,9 @@ static void nft_exthdr_ipv6_eval(const struct nft_expr *expr,unsigned int offset =0 ;int err; +if (pkt->skb->protocol !=htons (ETH_P_IPV6 )) + goto err; + err =ipv6_find_hdr (pkt->skb, &offset, priv->type,NULL ,NULL );if (priv->flags &NFT_EXTHDR_F_PRESENT ) {nft_reg_store8 (dest, err >=0 );
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 2/2 netfilter: nft_osf: check for TCP packet before further processing
The osf expression only supports for TCP packets, add a upfront sanity check to skip packet parsing if this is not a TCP packet.
Fixes b96af92d6eaf ("netfilter: nf_tables: implement Passive OS fingerprint module in nft_osf")
Signed-off-by Pablo Neira Ayuso <[email protected]>
Reported-by kernel test robot <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: fix kbuild report.
net/netfilter/nft_osf.c | 5 +++++ 1 file changed, 5 insertions(+)
net/netfilter/nft_osf.c +5 -0
@@ -28,6 +28,11 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs,struct nf_osf_data data;struct tcphdr _tcph; +if (pkt->tprot !=IPPROTO_TCP ) { + regs->verdict.code =NFT_BREAK ; +return ; + } + tcp =skb_header_pointer (skb,ip_hdrlen (skb),sizeof (struct tcphdr ), &_tcph);if (!tcp) {
Signature · 1 line
2.30.2