Commit 4e8bba94 authored Mar 17, 2020 by Haishuang Yan Committed by Greg Kroah-Hartman Apr 01, 2020

netfilter: flowtable: reload ip{v6}h in nf_flow_tuple_ip{v6}

commit 41e9ec5a54f95eee1a57c8d26ab70e0492548c1b upstream.

Since pskb_may_pull may change skb->data, so we need to reload ip{v6}h at
the right place.

Fixes: a908fdec ("netfilter: nf_flow_table: move ipv6 offload hook code to nf_flow_table")
Fixes: 7d208687 ("netfilter: nf_flow_table: move ipv4 offload hook code to nf_flow_table")
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0bc1c7f6

net/netfilter/nf_flow_table_ip.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,7 @@ static int nf_flow_tuple_ip(struct sk_buff skb, const struct net_device dev,
		if (!pskb_may_pull(skb, thoff + sizeof(*ports)))
		return -1;

		iph = ip_hdr(skb);
		ports = (struct flow_ports *)(skb_network_header(skb) + thoff);

		tuple->src_v4.s_addr = iph->saddr;
		@@ -449,6 +450,7 @@ static int nf_flow_tuple_ipv6(struct sk_buff skb, const struct net_device dev,
		if (!pskb_may_pull(skb, thoff + sizeof(*ports)))
		return -1;

		ip6h = ipv6_hdr(skb);
		ports = (struct flow_ports *)(skb_network_header(skb) + thoff);

		tuple->src_v6 = ip6h->saddr;