Skip to content

Commit 410184b

Browse files
Yang YingliangSasha Levin
Yang Yingliang
authored and
Sasha Levin
committed
scsi: scsi_transport_sas: Fix error handling in sas_phy_add()
[ Upstream commit 5d7bebf ] If transport_add_device() fails in sas_phy_add(), the kernel will crash trying to delete the device in transport_remove_device() called from sas_remove_host(). Unable to handle kernel NULL pointer dereference at virtual address 0000000000000108 CPU: 61 PID: 42829 Comm: rmmod Kdump: loaded Tainted: G W 6.1.0-rc1+ torvalds#173 pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) 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_phy_delete+0x30/0x60 [scsi_transport_sas] do_sas_phy_delete+0x6c/0x80 [scsi_transport_sas] device_for_each_child+0x68/0xb0 sas_remove_children+0x40/0x50 [scsi_transport_sas] sas_remove_host+0x20/0x38 [scsi_transport_sas] hisi_sas_remove+0x40/0x68 [hisi_sas_main] hisi_sas_v2_remove+0x20/0x30 [hisi_sas_v2_hw] platform_remove+0x2c/0x60 Fix this by checking and handling return value of transport_add_device() in sas_phy_add(). Fixes: c7ebbbc ("[SCSI] SAS transport class") Suggested-by: John Garry <[email protected]> Signed-off-by: Yang Yingliang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: John Garry <[email protected]> Reviewed-by: Jason Yan <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 6d46ef5 commit 410184b

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

drivers/scsi/scsi_transport_sas.c

+9-4
Original file line numberDiff line numberDiff line change
@@ -716,12 +716,17 @@ int sas_phy_add(struct sas_phy *phy)
716716
int error;
717717

718718
error = device_add(&phy->dev);
719-
if (!error) {
720-
transport_add_device(&phy->dev);
721-
transport_configure_device(&phy->dev);
719+
if (error)
720+
return error;
721+
722+
error = transport_add_device(&phy->dev);
723+
if (error) {
724+
device_del(&phy->dev);
725+
return error;
722726
}
727+
transport_configure_device(&phy->dev);
723728

724-
return error;
729+
return 0;
725730
}
726731
EXPORT_SYMBOL(sas_phy_add);
727732

0 commit comments

Comments
 (0)