gro: refetch inet6_protos[] after pulling ext headers

PATCH Applied Yan, Zheng 3 participants 3 messages Oct 9, 2011 – Oct 10, 2011

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Yan, Zheng

author

2011-10-09 08:34 UTC #0 lore raw

PATCH 1/1 gro: refetch inet6_protos[] after pulling ext headers

ipv6_gro_receive() doesn't update the protocol ops after pulling the ext headers. It looks like a typo.

Signed-off-by Zheng Yan <[email protected]>

---

net/ipv6/af_inet6.c +1 -0

index 3b5669a..d27c797 100644
@@ -875,6 +875,7 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head,
 		skb_reset_transport_header(skb);
 		__skb_push(skb, skb_gro_offset(skb));
 
+		ops = rcu_dereference(inet6_protos[proto]);
 		if (!ops || !ops->gro_receive)
 			goto out_unlock;

Eric Dumazet

Acked-by on v1 1/1

2011-10-09 09:33 UTC #1 lore raw

Quoted 10 lines · Zheng

ipv6_gro_receive() doesn't update the protocol ops after pulling the ext headers. It looks like a typo.
Signed-off-by Zheng Yan <[email protected]>
---
net/ipv6/af_inet6.c +0 -0
index 3b5669a..d27c797 100644

net/ipv6/af_inet6.c static struct sk_buff **ipv6_gro_receive(struct sk_buff **head, · line 880

Quoted 6 lines

net/ipv6/af_inet6.c +1 -0

@@ -875,6 +875,7 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head,
 		skb_reset_transport_header(skb);
 		__skb_push(skb, skb_gro_offset(skb));
 
+		ops = rcu_dereference(inet6_protos[proto]);
 		if (!ops || !ops->gro_receive)
 			goto out_unlock;

Good catch !

Acked-by Eric Dumazet <[email protected]>

David Miller

maintainer Applied

2011-10-10 18:26 UTC #2 lore raw

From: Eric Dumazet <[email protected]>
Date: Sun, 09 Oct 2011 11:33:51 +0200

Quoted 5 lines · Zheng

Quoted 4 lines
ipv6_gro_receive() doesn't update the protocol ops after pulling the ext headers. It looks like a typo.
Signed-off-by Zheng Yan <[email protected]>

...

Quoted 4 lines

Good catch !
Acked-by Eric Dumazet <[email protected]>

Applied, thanks!