Skip to content

Commit 7d277a7

Browse files
Andrey Vatoropinkuba-moo
authored andcommitted
be2net: pass wrb_params in case of OS2BMC
be_insert_vlan_in_pkt() is called with the wrb_params argument being NULL at be_send_pkt_to_bmc() call site.  This may lead to dereferencing a NULL pointer when processing a workaround for specific packet, as commit bc0c340 ("be2net: fix a Tx stall bug caused by a specific ipv6 packet") states. The correct way would be to pass the wrb_params from be_xmit(). Fixes: 760c295 ("be2net: Support for OS2BMC.") Cc: stable@vger.kernel.org Signed-off-by: Andrey Vatoropin <a.vatoropin@crpt.ru> Link: https://patch.msgid.link/20251119105015.194501-1-a.vatoropin@crpt.ru Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent dc9e7e6 commit 7d277a7

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

drivers/net/ethernet/emulex/benet/be_main.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,7 +1296,8 @@ static void be_xmit_flush(struct be_adapter *adapter, struct be_tx_obj *txo)
12961296
(adapter->bmc_filt_mask & BMC_FILT_MULTICAST)
12971297

12981298
static bool be_send_pkt_to_bmc(struct be_adapter *adapter,
1299-
struct sk_buff **skb)
1299+
struct sk_buff **skb,
1300+
struct be_wrb_params *wrb_params)
13001301
{
13011302
struct ethhdr *eh = (struct ethhdr *)(*skb)->data;
13021303
bool os2bmc = false;
@@ -1360,7 +1361,7 @@ static bool be_send_pkt_to_bmc(struct be_adapter *adapter,
13601361
* to BMC, asic expects the vlan to be inline in the packet.
13611362
*/
13621363
if (os2bmc)
1363-
*skb = be_insert_vlan_in_pkt(adapter, *skb, NULL);
1364+
*skb = be_insert_vlan_in_pkt(adapter, *skb, wrb_params);
13641365

13651366
return os2bmc;
13661367
}
@@ -1387,7 +1388,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)
13871388
/* if os2bmc is enabled and if the pkt is destined to bmc,
13881389
* enqueue the pkt a 2nd time with mgmt bit set.
13891390
*/
1390-
if (be_send_pkt_to_bmc(adapter, &skb)) {
1391+
if (be_send_pkt_to_bmc(adapter, &skb, &wrb_params)) {
13911392
BE_WRB_F_SET(wrb_params.features, OS2BMC, 1);
13921393
wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &wrb_params);
13931394
if (unlikely(!wrb_cnt))

0 commit comments

Comments
 (0)