bnx2x: Prevent null pointer dereference in AFEX mode
PATCH 1/1 bnx2x: Prevent null pointer dereference in AFEX mode
The cnic module is responsible for initializing various bnx2x structs via callbacks provided by the bnx2x module.
One such struct is the queue object for the FCoE queue.
If a device is working in AFEX mode and its configuration allows FCoE yet the cnic module is not loaded, it's very likely a null pointer dereference will occur, as the bnx2x will erroneously access the FCoE's queue object.
Prevent said access until cnic properly registers itself.
---
Hi Dave,
This small patch prevents a possible null pointer dereference in bnx2x.
Please consider applying it to `net'.
Thanks,
Yuval
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +2 -1
@@ -4959,7 +4959,7 @@ static void bnx2x_after_function_update(struct bnx2x *bp) q); } -if (!NO_FCOE (bp)) { +if (!NO_FCOE (bp) &&CNIC_ENABLED (bp)) { fp = &bp->fp[FCOE_IDX (bp)]; queue_params.q_obj = &bnx2x_sp_obj (bp, fp).q_obj;
@@ -13450,6 +13450,7 @@ static int bnx2x_unregister_cnic(struct net_device *dev)RCU_INIT_POINTER (bp->cnic_ops,NULL );mutex_unlock (&bp->cnic_mutex);synchronize_rcu (); + bp->cnic_enabled = false;kfree (bp->cnic_kwq); bp->cnic_kwq =NULL ;
Signature · 1 line
1.8.1.227.g44fe835
From: "Yuval Mintz" <[email protected]>
Date: Wed, 10 Apr 2013 13:34:39 +0300
Quoted 8 lines
The cnic module is responsible for initializing various bnx2x structs via callbacks provided by the bnx2x module.
One such struct is the queue object for the FCoE queue.If a device is working in AFEX mode and its configuration allows FCoE yet the cnic module is not loaded, it's very likely a null pointer dereference will occur, as the bnx2x will erroneously access the FCoE's queue object.
Quoted 5 lines
Prevent said access until cnic properly registers itself.
Signed-off-by Yuval Mintz <[email protected]>Signed-off-by Ariel Elior <[email protected]>Signed-off-by Eilon Greenstein <[email protected]>
Applied, thanks.