Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2d3492f authored by Dan Carpenter's avatar Dan Carpenter Committed by Martin K. Petersen
Browse files

scsi: bnx2fc: Fix error handling in probe() 



There are two issues here.  First if cmgr->hba is not set early enough then
it leads to a NULL dereference.  Second if we don't completely initialize
cmgr->io_bdt_pool[] then we end up dereferencing uninitialized pointers.

Fixes: 853e2bd2 ("[SCSI] bnx2fc: Broadcom FCoE offload driver")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 40d07b52

drivers/scsi/bnx2fc/bnx2fc_io.c

+2 −2
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba) 
		return NULL;

	}



	cmgr->hba = hba;

	cmgr->free_list = kcalloc(arr_sz, sizeof(*cmgr->free_list),

				  GFP_KERNEL);

	if (!cmgr->free_list) {
@@ -256,7 +257,6 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba) 
		goto mem_err;

	}



	cmgr->hba = hba;

	cmgr->cmds = (struct bnx2fc_cmd **)(cmgr + 1);



	for (i = 0; i < arr_sz; i++)  {
@@ -295,7 +295,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba) 


	/* Allocate pool of io_bdts - one for each bnx2fc_cmd */

	mem_size = num_ios * sizeof(struct io_bdt *);

	cmgr->io_bdt_pool = kmalloc(mem_size, GFP_KERNEL);

	cmgr->io_bdt_pool = kzalloc(mem_size, GFP_KERNEL);

	if (!cmgr->io_bdt_pool) {

		printk(KERN_ERR PFX "failed to alloc io_bdt_pool\n");

		goto mem_err;