Commit a65e8f12 authored Mar 26, 2015 by Brian King Committed by James Bottomley Apr 09, 2015

ipr: Fix possible error path oops during initialization



Fixes a possible oops during adapter initialization in some
memory allocation failure error paths scenarios.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Reviewed-by: Wen Xiong <wenxiong@linux.vnet.ibm.com>
Reviewed-by: Daniel Kreling <kreling@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

parent 2796ca5e

drivers/scsi/ipr.c

+9 −7

Original line number	Diff line number	Diff line
		@@ -9060,6 +9060,7 @@ static void ipr_free_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)
		{
		int i;

		if (ioa_cfg->ipr_cmnd_list) {
		for (i = 0; i < IPR_NUM_CMD_BLKS; i++) {
		if (ioa_cfg->ipr_cmnd_list[i])
		dma_pool_free(ioa_cfg->ipr_cmd_pool,
		@@ -9068,6 +9069,7 @@ static void ipr_free_cmd_blks(struct ipr_ioa_cfg *ioa_cfg)

		ioa_cfg->ipr_cmnd_list[i] = NULL;
		}
		}

		if (ioa_cfg->ipr_cmd_pool)
		dma_pool_destroy(ioa_cfg->ipr_cmd_pool);