scsi: csiostor: add a check for NULL pointer after kmalloc()
Reported-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Varun Prakash <varun@chelsio.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Родитель
a7ccd92c8d
Коммит
89809b028b
|
@ -2364,8 +2364,8 @@ bye:
|
|||
}
|
||||
|
||||
/*
|
||||
* Returns -EINVAL if attempts to flash the firmware failed
|
||||
* else returns 0,
|
||||
* Returns -EINVAL if attempts to flash the firmware failed,
|
||||
* -ENOMEM if memory allocation failed else returns 0,
|
||||
* if flashing was not attempted because the card had the
|
||||
* latest firmware ECANCELED is returned
|
||||
*/
|
||||
|
@ -2393,6 +2393,13 @@ csio_hw_flash_fw(struct csio_hw *hw, int *reset)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* allocate memory to read the header of the firmware on the
|
||||
* card
|
||||
*/
|
||||
card_fw = kmalloc(sizeof(*card_fw), GFP_KERNEL);
|
||||
if (!card_fw)
|
||||
return -ENOMEM;
|
||||
|
||||
if (csio_is_t5(pci_dev->device & CSIO_HW_CHIP_MASK))
|
||||
fw_bin_file = FW_FNAME_T5;
|
||||
else
|
||||
|
@ -2406,11 +2413,6 @@ csio_hw_flash_fw(struct csio_hw *hw, int *reset)
|
|||
fw_size = fw->size;
|
||||
}
|
||||
|
||||
/* allocate memory to read the header of the firmware on the
|
||||
* card
|
||||
*/
|
||||
card_fw = kmalloc(sizeof(*card_fw), GFP_KERNEL);
|
||||
|
||||
/* upgrade FW logic */
|
||||
ret = csio_hw_prep_fw(hw, fw_info, fw_data, fw_size, card_fw,
|
||||
hw->fw_state, reset);
|
||||
|
|
Загрузка…
Ссылка в новой задаче