Skip to contentSkip to conversation

netfilter: use skb_to_full_sk in ip6_route_me_harder

PATCH Applied Eric Dumazet 3 participants 7 messages Feb 25, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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")

Fixes ca6fb0651883 ("tcp: attach SYNACK messages to request sockets instead of listener")

---
 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);

maintainer
#1 lore raw
Quoted 5 lines · Eric Dumazet

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")

Indeed, sorry about that, thanks for taking care of this.

#2 lore raw
In reply to Eric Dumazet
Quoted 52 lines · Eric Dumazet

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")

Fixes ca6fb0651883 ("tcp: attach SYNACK messages to request sockets instead of listener")

---
 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 +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))
  return PTR_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.

maintainer Applied
#4 lore raw
In reply to Eric Dumazet
Quoted 5 lines · Eric Dumazet

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")

Applied, thanks Eric.

#3 lore raw
In reply to Eric Dumazet
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.

#5 lore raw

PATCH v2 1/1 netfilter: use skb_to_full_sk in ip6_route_me_harder

In reply to Eric Dumazet

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")

Fixes ca6fb0651883 ("tcp: attach SYNACK messages to request sockets instead of listener")

---
 net/ipv6/netfilter.c |    9 +++++----

 1 file changed, 5 insertions(+), 4 deletions(-)
net/ipv6/netfilter.c +5 -4
index d95ceca7ff8f648ff301d91a2e3eb60fc2050f1c..531d6957af36c4af48176f9360e9d95f78a45d55 100644
@@ -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);
maintainer Applied
#6 lore raw
Quoted 5 lines · Eric Dumazet

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")

Applied this one, thanks Eric.