diff mbox

gro: refetch inet6_protos[] after pulling ext headers

Message ID 4E915C9B.4000807@intel.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Yan, Zheng Oct. 9, 2011, 8:34 a.m. UTC
ipv6_gro_receive() doesn't update the protocol ops after pulling
the ext headers. It looks like a typo.

Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
---
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Eric Dumazet Oct. 9, 2011, 9:33 a.m. UTC | #1
Le dimanche 09 octobre 2011 à 16:34 +0800, Yan, Zheng a écrit :
> ipv6_gro_receive() doesn't update the protocol ops after pulling
> the ext headers. It looks like a typo.
> 
> Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
> ---
> diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
> index 3b5669a..d27c797 100644
> --- a/net/ipv6/af_inet6.c
> +++ b/net/ipv6/af_inet6.c
> @@ -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 <eric.dumazet@gmail.com>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller Oct. 10, 2011, 6:26 p.m. UTC | #2
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 09 Oct 2011 11:33:51 +0200

> Le dimanche 09 octobre 2011 à 16:34 +0800, Yan, Zheng a écrit :
>> ipv6_gro_receive() doesn't update the protocol ops after pulling
>> the ext headers. It looks like a typo.
>> 
>> Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
 ...
> 
> Good catch !
> 
> Acked-by: Eric Dumazet <eric.dumazet@gmail.com>

Applied, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 3b5669a..d27c797 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -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;