UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: skb_is_gso_v6() requires skb_is_gso() 

bnx2x makes a dangerous use of skb_is_gso_v6().

It should first make sure skb is a gso packet

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Eilon Greenstein <eilong@broadcom.com>
Acked-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2013-09-29 01:21:32 -07:00 committed by David S. Miller
parent c3f40d7c04
commit 36a8f39e05
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
View File

@ -3256,15 +3256,17 @@ static u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)
if (prot == IPPROTO_TCP) if (prot == IPPROTO_TCP)
rc |= XMIT_CSUM_TCP; rc |= XMIT_CSUM_TCP;
if (skb_is_gso(skb)) {
if (skb_is_gso_v6(skb)) { if (skb_is_gso_v6(skb)) {
rc |= (XMIT_GSO_V6 | XMIT_CSUM_TCP); rc |= (XMIT_GSO_V6 | XMIT_CSUM_TCP);
if (rc & XMIT_CSUM_ENC) if (rc & XMIT_CSUM_ENC)
rc |= XMIT_GSO_ENC_V6; rc |= XMIT_GSO_ENC_V6;
} else if (skb_is_gso(skb)) { } else {
rc |= (XMIT_GSO_V4 | XMIT_CSUM_TCP); rc |= (XMIT_GSO_V4 | XMIT_CSUM_TCP);
if (rc & XMIT_CSUM_ENC) if (rc & XMIT_CSUM_ENC)
rc |= XMIT_GSO_ENC_V4; rc |= XMIT_GSO_ENC_V4;
} }
}
return rc; return rc;
} }

1
include/linux/skbuff.h
View File

@ -2755,6 +2755,7 @@ static inline bool skb_is_gso(const struct sk_buff *skb)
return skb_shinfo(skb)->gso_size; return skb_shinfo(skb)->gso_size;
} }
/* Note: Should be called only if skb_is_gso(skb) is true */
static inline bool skb_is_gso_v6(const struct sk_buff *skb) static inline bool skb_is_gso_v6(const struct sk_buff *skb)
{ {
return skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6; return skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6;