projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff0df20
)
benet: fix return value check in be_lancer_xmit_workarounds()
author
Yuanjun Gong
<ruc_gongyuanjun@163.com>
Tue, 25 Jul 2023 03:27:26 +0000
(11:27 +0800)
committer
Paolo Abeni
<pabeni@redhat.com>
Thu, 27 Jul 2023 08:31:38 +0000
(10:31 +0200)
in be_lancer_xmit_workarounds(), it should go to label 'tx_drop'
if an unexpected value is returned by pskb_trim().
Fixes:
93040ae5cc8d
("be2net: Fix to trim skb for padded vlan packets to workaround an ASIC Bug")
Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
Link:
https://lore.kernel.org/r/20230725032726.15002-1-ruc_gongyuanjun@163.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/ethernet/emulex/benet/be_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/emulex/benet/be_main.c
b/drivers/net/ethernet/emulex/benet/be_main.c
index
18c2fc8
..
0616b5f
100644
(file)
--- a/
drivers/net/ethernet/emulex/benet/be_main.c
+++ b/
drivers/net/ethernet/emulex/benet/be_main.c
@@
-1138,7
+1138,8
@@
static struct sk_buff *be_lancer_xmit_workarounds(struct be_adapter *adapter,
(lancer_chip(adapter) || BE3_chip(adapter) ||
skb_vlan_tag_present(skb)) && is_ipv4_pkt(skb)) {
ip = (struct iphdr *)ip_hdr(skb);
- pskb_trim(skb, eth_hdr_len + ntohs(ip->tot_len));
+ if (unlikely(pskb_trim(skb, eth_hdr_len + ntohs(ip->tot_len))))
+ goto tx_drop;
}
/* If vlan tag is already inlined in the packet, skip HW VLAN