From: Pablo Neira Ayuso <pablo@netfilter.org> To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 3/9] netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING Date: Thu, 21 Mar 2019 12:28:39 +0100 [thread overview] Message-ID: <20190321112845.10627-4-pablo@netfilter.org> (raw) In-Reply-To: <20190321112845.10627-1-pablo@netfilter.org> From: Xin Long <lucien.xin@gmail.com> 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> --- net/bridge/br_netfilter_hooks.c | 1 + net/bridge/br_netfilter_ipv6.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c index 9d34de68571b..22afa566cbce 100644 --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c @@ -502,6 +502,7 @@ static unsigned int br_nf_pre_routing(void *priv, nf_bridge->ipv4_daddr = ip_hdr(skb)->daddr; skb->protocol = htons(ETH_P_IP); + skb->transport_header = skb->network_header + ip_hdr(skb)->ihl * 4; NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, state->net, state->sk, skb, skb->dev, NULL, 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); -- 2.11.0
next prev parent reply other threads:[~2019-03-21 11:29 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-21 11:28 [PATCH 0/9] Netfilter fixes for net Pablo Neira Ayuso 2019-03-21 11:28 ` [PATCH 1/9] netfilter: nf_conntrack_sip: remove direct dependency on IPv6 Pablo Neira Ayuso 2019-03-21 11:28 ` [PATCH 2/9] netfilter: nft_set_rbtree: check for inactive element after flag mismatch Pablo Neira Ayuso 2019-03-21 11:28 ` Pablo Neira Ayuso [this message] 2019-03-21 11:28 ` [PATCH 4/9] netfilter: fix NETFILTER_XT_TARGET_TEE dependencies Pablo Neira Ayuso 2019-03-21 11:28 ` [PATCH 5/9] netfilter: ip6t_srh: fix NULL pointer dereferences Pablo Neira Ayuso 2019-03-21 11:28 ` [PATCH 6/9] netfilter: nf_tables: bogus EBUSY in helper removal from transaction Pablo Neira Ayuso 2019-03-21 11:28 ` [PATCH 7/9] netfilter: nft_redir: fix module autoload with ip4 Pablo Neira Ayuso 2019-03-21 11:28 ` [PATCH 8/9] netfilter: nf_flowtable: remove duplicated transition in diagram Pablo Neira Ayuso 2019-03-21 11:28 ` [PATCH 9/9] netfilter: nf_tables: add missing ->release_ops() in error path of newrule() Pablo Neira Ayuso 2019-03-21 17:07 ` [PATCH 0/9] Netfilter fixes for net David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190321112845.10627-4-pablo@netfilter.org \ --to=pablo@netfilter.org \ --cc=davem@davemloft.net \ --cc=netdev@vger.kernel.org \ --cc=netfilter-devel@vger.kernel.org \ --subject='Re: [PATCH 3/9] netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).