Skip to contentSkip to conversation

scsi: lpfc: Fix a possible null pointer dereference

PATCH RESEND Superseded Huai-Yuan Liu 2 participants 2 messages Jun 14, 2024

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH RESEND v2 1/1 scsi: lpfc: Fix a possible null pointer dereference

In function lpfc_xcvr_data_show, the memory allocation with kmalloc might fail, thereby making rdp_context a null pointer. In the following context and functions that use this pointer, there are dereferencing operations, leading to null pointer dereference.

To fix this issue, a null pointer check should be added. If it is null, just jump to 'out_free_rdp'.

Fixes 479b0917e447 ("scsi: lpfc: Create a sysfs entry called lpfc_xcvr_data for transceiver info")

---
V2:
* In patch V2, we have removed the unnecessary 'out of memory' message. Thank Bart Van Assche for helpful advice.

---
 drivers/scsi/lpfc/lpfc_attr.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/scsi/lpfc/lpfc_attr.c +2 -0
index b1c9107d3408..94d968a255ff 100644
@@ -1904,6 +1904,8 @@ lpfc_xcvr_data_show(struct device *dev, struct device_attribute *attr,
 
 	/* Get transceiver information */
 	rdp_context = kmalloc(sizeof(*rdp_context), GFP_KERNEL);
+	if (!rdp_context)
+		goto out_free_rdp;
 
 	rc = lpfc_get_sfp_info_wait(phba, rdp_context);
 	if (rc) {
Signature · 1 line
2.34.1
#1 lore raw

Hi Huai-Yuan,

drivers/scsi/lpfc/lpfc_attr.c lpfc_xcvr_data_show(struct device *dev, struct device_attribute *attr, · line 1908

Quoted 10 lines
drivers/scsi/lpfc/lpfc_attr.c +2 -0
index b1c9107d3408..94d968a255ff 100644
@@ -1904,6 +1904,8 @@ lpfc_xcvr_data_show(struct device *dev, struct device_attribute *attr,
 
        /* Get transceiver information */
        rdp_context = kmalloc(sizeof(*rdp_context), GFP_KERNEL);
+       if (!rdp_context)
+               goto out_free_rdp;

Understood that kfree(NULL) essentially translates to no-op, but I'd prefer that we return len here instead of goto out_free_rdp because there really is nothing to free if kmalloc failed.

Thanks,
Justin