Commit 312320b0 authored by Justin Tee's avatar Justin Tee Committed by Martin K. Petersen
Browse files

scsi: lpfc: Check kzalloc() in lpfc_sli4_cgn_params_read() 



If kzalloc() fails in lpfc_sli4_cgn_params_read(), then we rely on
lpfc_read_object()'s routine to NULL check pdata.

Currently, an early return error is thrown from lpfc_read_object() to
protect us from NULL ptr dereference, but the errno code is -ENODEV.

Change the errno code to a more appropriate -ENOMEM.

Reported-by: default avatarKang Chen <void0red@gmail.com>
Link: https://lore.kernel.org/all/20230226102338.3362585-1-void0red@gmail.com


Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Link: https://lore.kernel.org/r/20230228044336.5195-1-justintee8345@gmail.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c9507eab

drivers/scsi/lpfc/lpfc_init.c

+2 −0
Original line number Diff line number Diff line
@@ -7291,6 +7291,8 @@ lpfc_sli4_cgn_params_read(struct lpfc_hba *phba) 
	/* Find out if the FW has a new set of congestion parameters. */

	len = sizeof(struct lpfc_cgn_param);

	pdata = kzalloc(len, GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;

	ret = lpfc_read_object(phba, (char *)LPFC_PORT_CFG_NAME,

			       pdata, len);

drivers/scsi/lpfc/lpfc_sli.c

+0 −4
Original line number Diff line number Diff line
@@ -22109,10 +22109,6 @@ lpfc_read_object(struct lpfc_hba *phba, char *rdobject, uint32_t *datap, 
	struct lpfc_dmabuf *pcmd;

	u32 rd_object_name[LPFC_MBX_OBJECT_NAME_LEN_DW] = {0};









	/* sanity check on queue memory */









	if (!datap)









		return -ENODEV;

















	mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);









	if (!mbox)









		return -ENOMEM;