summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_netfilter_ipv6.c
diff options
context:
space:
mode:
authorXin Long2019-03-13 09:33:29 +0100
committerPablo Neira Ayuso2019-03-18 16:21:54 +0100
commite166e4fdaced850bee3d5ee12a5740258fb30587 (patch)
tree1d44f8ea9b079e674837793e01c6cab131b3a67f /net/bridge/br_netfilter_ipv6.c
parentnetfilter: nft_set_rbtree: check for inactive element after flag mismatch (diff)
downloadkernel-qcow2-linux-e166e4fdaced850bee3d5ee12a5740258fb30587.tar.gz
kernel-qcow2-linux-e166e4fdaced850bee3d5ee12a5740258fb30587.tar.xz
kernel-qcow2-linux-e166e4fdaced850bee3d5ee12a5740258fb30587.zip
netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING
Since Commit 21d1196a35f5 ("ipv4: set transport header earlier"), skb->transport_header has been always set before entering INET netfilter. This patch is to set skb->transport_header for bridge before entering INET netfilter by bridge-nf-call-iptables. It also fixes an issue that sctp_error() couldn't compute a right csum due to unset skb->transport_header. Fixes: e6d8b64b34aa ("net: sctp: fix and consolidate SCTP checksumming code") Reported-by: Li Shuang <shuali@redhat.com> Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Xin Long <lucien.xin@gmail.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Acked-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge/br_netfilter_ipv6.c')
-rw-r--r--net/bridge/br_netfilter_ipv6.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_netfilter_ipv6.c b/net/bridge/br_netfilter_ipv6.c
index 564710f88f93..e88d6641647b 100644
--- a/net/bridge/br_netfilter_ipv6.c
+++ b/net/bridge/br_netfilter_ipv6.c
@@ -235,6 +235,8 @@ unsigned int br_nf_pre_routing_ipv6(void *priv,
nf_bridge->ipv6_daddr = ipv6_hdr(skb)->daddr;
skb->protocol = htons(ETH_P_IPV6);
+ skb->transport_header = skb->network_header + sizeof(struct ipv6hdr);
+
NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, state->net, state->sk, skb,
skb->dev, NULL,
br_nf_pre_routing_finish_ipv6);