Commit 60cd3186 authored by Daniel Axtens's avatar Daniel Axtens Committed by Greg Kroah-Hartman

bnx2x: disable GSO where gso_size is too big for hardware

commit 8914a595 upstream

If a bnx2x card is passed a GSO packet with a gso_size larger than
~9700 bytes, it will cause a firmware error that will bring the card
down:

bnx2x: [bnx2x_attn_int_deasserted3:4323(enP24p1s0f0)]MC assert!
bnx2x: [bnx2x_mc_assert:720(enP24p1s0f0)]XSTORM_ASSERT_LIST_INDEX 0x2
bnx2x: [bnx2x_mc_assert:736(enP24p1s0f0)]XSTORM_ASSERT_INDEX 0x0 = 0x00000000 0x25e43e47 0x00463e01 0x00010052
bnx2x: [bnx2x_mc_assert:750(enP24p1s0f0)]Chip Revision: everest3, FW Version: 7_13_1
... (dump of values continues) ...

Detect when the mac length of a GSO packet is greater than the maximum
packet size (9700 bytes) and disable GSO.
Signed-off-by: default avatarDaniel Axtens <dja@axtens.net>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
[jwang: cherry pick for CVE-2018-1000026]
Signed-off-by: default avatarJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 785644d6
...@@ -12978,6 +12978,24 @@ static netdev_features_t bnx2x_features_check(struct sk_buff *skb, ...@@ -12978,6 +12978,24 @@ static netdev_features_t bnx2x_features_check(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev,
netdev_features_t features) netdev_features_t features)
{ {
/*
* A skb with gso_size + header length > 9700 will cause a
* firmware panic. Drop GSO support.
*
* Eventually the upper layer should not pass these packets down.
*
* For speed, if the gso_size is <= 9000, assume there will
* not be 700 bytes of headers and pass it through. Only do a
* full (slow) validation if the gso_size is > 9000.
*
* (Due to the way SKB_BY_FRAGS works this will also do a full
* validation in that case.)
*/
if (unlikely(skb_is_gso(skb) &&
(skb_shinfo(skb)->gso_size > 9000) &&
!skb_gso_validate_mac_len(skb, 9700)))
features &= ~NETIF_F_GSO_MASK;
features = vlan_features_check(skb, features); features = vlan_features_check(skb, features);
return vxlan_features_check(skb, features); return vxlan_features_check(skb, features);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment