netfilter: use skb_to_full_sk in ip6_route_me_harder
Subsystems (3)
PATCH 1/1 netfilter: use skb_to_full_sk in ip6_route_me_harder
From: Eric Dumazet <[email protected]>
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")
---
net/ipv6/netfilter.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
net/ipv6/netfilter.c +0 -0
index d95ceca7ff8f648ff301d91a2e3eb60fc2050f1c..531d6957af36c4af48176f9360e9d 95f78a45d55 100644
net/ipv6/netfilter.c +0 -0
@@ -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);
Florian Westphal
maintainerQuoted 5 lines · Eric Dumazet
From: Eric Dumazet <[email protected]>
For some reason, Florian forgot to apply to
ip6_route_me_harderthe fix that went in commit29e09229d9f2("netfilter: useskb_to_full_skinip_route_me_harder")
Indeed, sorry about that, thanks for taking care of this.
Quoted 52 lines · Eric Dumazet
From: Eric Dumazet <[email protected]>
For some reason, Florian forgot to apply to
ip6_route_me_harderthe fix that went in commit29e09229d9f2("netfilter: useskb_to_full_skinip_route_me_harder")Fixes ca6fb0651883 ("tcp: attach SYNACK messages to request sockets instead of listener")Signed-off-by Eric Dumazet <[email protected]>Reported-by syzbot <[email protected]>---
net/ipv6/netfilter.c | 9 +++++----1 file changed, 5 insertions(+), 4 deletions(-)net/ipv6/netfilter.c +0
-0index
d95ceca7ff8f648ff301d91a2e3eb60fc2050f1c..531d6957af36c4af48176f9360e9d95f78a45d55100644net/ipv6/netfilter.c +3
-2@@ -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;net/ipv6/netfilter.c +1
-1- 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);net/ipv6/netfilter.c +0
-0@@ -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);net/ipv6/netfilter.c +0
-1- dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6),
skb->sk, 0);net/ipv6/netfilter.c +1
-0+ dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), sk,
Quoted 4 lines
0);
if (IS_ERR(dst))
returnPTR_ERR(dst);
skb_dst_set(skb, dst);
No idea what happened, but it looks like this garbage should not affect
patchwork.
Tell me if a resend is needed, thanks.
Quoted 6 lines · Eric Dumazet
No idea what happened, but it looks like this garbage should not affect
patchwork.Tell me if a resend is needed, thanks.
Hmm... I will send a V2, sorry for this mess.
Quoted 5 lines · Eric Dumazet
From: Eric Dumazet <[email protected]>
For some reason, Florian forgot to apply to
ip6_route_me_harderthe fix that went in commit29e09229d9f2("netfilter: useskb_to_full_skinip_route_me_harder")
Applied, thanks Eric.
PATCH v2 1/1 netfilter: use skb_to_full_sk in ip6_route_me_harder
In reply to Eric DumazetFrom: Eric Dumazet <[email protected]>
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")
---
net/ipv6/netfilter.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
net/ipv6/netfilter.c +5 -4
@@ -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);
Quoted 5 lines · Eric Dumazet
From: Eric Dumazet <[email protected]>
For some reason, Florian forgot to apply to
ip6_route_me_harderthe fix that went in commit29e09229d9f2("netfilter: useskb_to_full_skinip_route_me_harder")
Applied this one, thanks Eric.