netdev - Re: [PATCH net-next] net/core: move vlan_depth out of while loop in skb_network

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1363071386.13690.7.camel@edumazet-glaptop>
Date:	Tue, 12 Mar 2013 07:56:26 +0100
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	roy.qing.li@...il.com
Cc:	netdev@...r.kernel.org, Pravin B Shelar <pshelar@...ira.com>
Subject: Re: [PATCH net-next] net/core: move vlan_depth out of while loop in
 skb_network_protocol()

On Tue, 2013-03-12 at 14:30 +0800, roy.qing.li@...il.com wrote:
> From: Li RongQing <roy.qing.li@...il.com>
> 
> move vlan_depth out of while loop, or else vlan_depth always is ETH_HLEN,
> can not be increased, and lead to infinite loop when frame has two vlan headers.
> 
> Signed-off-by: Li RongQing <roy.qing.li@...il.com>
> ---
>  net/core/dev.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 90cee5b..35a6a6e 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -2211,9 +2211,9 @@ EXPORT_SYMBOL(skb_checksum_help);
>  __be16 skb_network_protocol(struct sk_buff *skb)
>  {
>  	__be16 type = skb->protocol;
> +	int vlan_depth = ETH_HLEN;
>  
>  	while (type == htons(ETH_P_8021Q)) {
> -		int vlan_depth = ETH_HLEN;
>  		struct vlan_hdr *vh;
>  
>  		if (unlikely(!pskb_may_pull(skb, vlan_depth + VLAN_HLEN)))

Nice catch, bug added in commit 05e8ef4ab2d8087d (net: factor out
skb_mac_gso_segment() from skb_gso_segment() )

So this is a patch for net tree, not for net-next.

Acked-by: Eric Dumazet <edumazet@...gle.com>



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