Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d98386d authored by Eric Dumazet's avatar Eric Dumazet Committed by Pablo Neira Ayuso
Browse files

netfilter: use skb_to_full_sk in ip6_route_me_harder 



For some reason, Florian forgot to apply to ip6_route_me_harder
the fix that went in commit 29e09229 ("netfilter: use
skb_to_full_sk in ip_route_me_harder")

Fixes: ca6fb065 ("tcp: attach SYNACK messages to request sockets instead of listener") 
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 47b7e7f8

net/ipv6/netfilter.c

+5 −4
Original line number Diff line number Diff line
@@ -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);