Skip to contentSkip to conversation

scsi: scsi_transport_sas: fix error handling in sas_port_add()

PATCH Superseded Yang Yingliang 2 participants 2 messages Nov 11, 2022 SCSI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: scsi_transport_sas: fix error handling in sas_port_add()

In sas_port_add(), the return value of transport_add_device() is not checked. As a result, it causes null-ptr-deref while removing device, because transport_remove_device() is called to remove the device that was not added.

Unable to handle kernel NULL pointer dereference at virtual address 0000000000000108
pc : device_del+0x54/0x3d0
lr : device_del+0x37c/0x3d0
Call trace:
 device_del+0x54/0x3d0
 attribute_container_class_device_del+0x28/0x38
 transport_remove_classdev+0x6c/0x80
 attribute_container_device_trigger+0x108/0x110
 transport_remove_device+0x28/0x38
 sas_port_delete+0x110/0x148 [scsi_transport_sas]
 do_sas_phy_delete+0x78/0x80 [scsi_transport_sas]
 device_for_each_child+0x68/0xb0
 sas_remove_children+0x30/0x50 [scsi_transport_sas]
 sas_rphy_remove+0x38/0x78 [scsi_transport_sas]
 sas_port_delete+0x30/0x148 [scsi_transport_sas]
 do_sas_phy_delete+0x78/0x80 [scsi_transport_sas]
 device_for_each_child+0x68/0xb0
 sas_remove_children+0x30/0x50 [scsi_transport_sas]
 sas_remove_host+0x20/0x38 [scsi_transport_sas]
 scsih_remove+0xd8/0x420 [mpt3sas]

Fix this by checking and handling return value of transport_add_device() in sas_port_add().

Fixes 65c92b09acf0 ("[SCSI] scsi_transport_sas: introduce a sas_port entity")
---
 drivers/scsi/scsi_transport_sas.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/scsi/scsi_transport_sas.c +5 -1
index accc0afa8f77..e090486258a5 100644
@@ -959,7 +959,11 @@ int sas_port_add(struct sas_port *port)
 	if (error)
 		return error;
 
-	transport_add_device(&port->dev);
+	error = transport_add_device(&port->dev);
+	if (error) {
+		device_del(&port->dev);
+		return error;
+	}
 	transport_configure_device(&port->dev);
 
 	return 0;
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Yang Yingliang

In sas_port_add(), the return value of transport_add_device() is not checked. As a result, it causes null-ptr-deref while removing device, because transport_remove_device() is called to remove the device that was not added.

This makes it sound like we have the null-ptr-deref always, which would not be the case.

You need to make it clear that we don't check for an error in the add and we may later go on to try to remove a device which was never successfully added, causing the null-ptr-deref.

Quoted 1 line

Apart from comment, above: