From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 10/14] netfilter: use skb_to_full_sk in ip6_route_me_harder
Date: Fri, 2 Mar 2018 21:32:58 +0100 [thread overview]
Message-ID: <20180302203302.3724-11-pablo@netfilter.org> (raw)
In-Reply-To: <20180302203302.3724-1-pablo@netfilter.org>
From: Eric Dumazet <edumazet@google.com>
For some reason, Florian forgot to apply to ip6_route_me_harder
the fix that went in commit 29e09229d9f2 ("netfilter: use
skb_to_full_sk in ip_route_me_harder")
Fixes: ca6fb0651883 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/ipv6/netfilter.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index d95ceca7ff8f..531d6957af36 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -21,18 +21,19 @@
int ip6_route_me_harder(struct net *net, struct sk_buff *skb)
{
const struct ipv6hdr *iph = ipv6_hdr(skb);
+ struct sock *sk = sk_to_full_sk(skb->sk);
unsigned int hh_len;
struct dst_entry *dst;
struct flowi6 fl6 = {
- .flowi6_oif = skb->sk ? skb->sk->sk_bound_dev_if : 0,
+ .flowi6_oif = sk ? sk->sk_bound_dev_if : 0,
.flowi6_mark = skb->mark,
- .flowi6_uid = sock_net_uid(net, skb->sk),
+ .flowi6_uid = sock_net_uid(net, sk),
.daddr = iph->daddr,
.saddr = iph->saddr,
};
int err;
- dst = ip6_route_output(net, skb->sk, &fl6);
+ dst = ip6_route_output(net, sk, &fl6);
err = dst->error;
if (err) {
IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);
@@ -50,7 +51,7 @@ int ip6_route_me_harder(struct net *net, struct sk_buff *skb)
if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) &&
xfrm_decode_session(skb, flowi6_to_flowi(&fl6), AF_INET6) == 0) {
skb_dst_set(skb, NULL);
- dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), skb->sk, 0);
+ dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), sk, 0);
if (IS_ERR(dst))
return PTR_ERR(dst);
skb_dst_set(skb, dst);
--
2.11.0
next prev parent reply other threads:[~2018-03-02 20:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 20:32 [PATCH 00/14] Netfilter/IPVS fixes for net Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 01/14] netfilter: ipt_CLUSTERIP: put config struct if we can't increment ct refcount Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 02/14] netfilter: ipt_CLUSTERIP: put config instead of freeing it Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 03/14] netfilter: ipv6: fix use-after-free Write in nf_nat_ipv6_manip_pkt Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 04/14] netfilter: bridge: ebt_among: add missing match size checks Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 05/14] netfilter: ebtables: convert BUG_ONs to WARN_ONs Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 06/14] netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 07/14] netfilter: nf_flow_table: fix checksum when handling DNAT Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 08/14] netfilter: increase IPSTATS_MIB_CSUMERRORS stat Pablo Neira Ayuso
2018-03-02 20:32 ` [PATCH 09/14] netfilter: don't set F_IFACE on ipv6 fib lookups Pablo Neira Ayuso
2018-03-02 20:32 ` Pablo Neira Ayuso [this message]
2018-03-02 20:32 ` [PATCH 11/14] netfilter: nf_tables: return EBUSY if device already belongs to flowtable Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 12/14] netfilter: nf_tables: missing attribute validation in nf_tables_delflowtable() Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 13/14] netfilter: nf_tables: use the right index from flowtable error path Pablo Neira Ayuso
2018-03-02 20:33 ` [PATCH 14/14] ipvs: remove IPS_NAT_MASK check to fix passive FTP Pablo Neira Ayuso
2018-03-03 1:32 ` [PATCH 00/14] Netfilter/IPVS 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=20180302203302.3724-11-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).