diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2013-01-12 00:43:48 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-01-30 00:48:51 +0100 |
| commit | a2e49cb262208a4c3adec7788ecc1179e07dc912 (patch) | |
| tree | ef89704952cd3b04b96010933b8bda9f4bef5c59 /drivers/scsi/ipr.c | |
| parent | [SCSI] ipr: Add sereral new CCIN definitions for new adapters support (diff) | |
| download | linux-a2e49cb262208a4c3adec7788ecc1179e07dc912.tar.xz linux-a2e49cb262208a4c3adec7788ecc1179e07dc912.zip | |
[SCSI] ipr: Handler ID memory allocation failure at module load time
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Wen Xiong <wenxiong@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/ipr.c')
| -rw-r--r-- | drivers/scsi/ipr.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 8d1b806f6022..0a152ef8b741 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -8516,6 +8516,10 @@ static int ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg) BITS_TO_LONGS(ioa_cfg->max_devs_supported), GFP_KERNEL); ioa_cfg->vset_ids = kzalloc(sizeof(unsigned long) * BITS_TO_LONGS(ioa_cfg->max_devs_supported), GFP_KERNEL); + + if (!ioa_cfg->target_ids || !ioa_cfg->array_ids + || !ioa_cfg->vset_ids) + goto out_free_res_entries; } for (i = 0; i < ioa_cfg->max_devs_supported; i++) { @@ -8591,6 +8595,9 @@ out_free_vpd_cbs: ioa_cfg->vpd_cbs, ioa_cfg->vpd_cbs_dma); out_free_res_entries: kfree(ioa_cfg->res_entries); + kfree(ioa_cfg->target_ids); + kfree(ioa_cfg->array_ids); + kfree(ioa_cfg->vset_ids); goto out; } |