Skip to content

Commit f23058d

Browse files
Yang Yinglianggregkh
Yang Yingliang
authored andcommitted
ata: libata-transport: fix error handling in ata_tdev_add()
[ Upstream commit 1ff3635 ] In ata_tdev_add(), the return value of transport_add_device() is not checked. As a result, it causes null-ptr-deref while removing the module, because transport_remove_device() is called to remove the device that was not added. Unable to handle kernel NULL pointer dereference at virtual address 00000000000000d0 CPU: 13 PID: 13603 Comm: rmmod Kdump: loaded Tainted: G W 6.1.0-rc3+ Freescale#36 pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : device_del+0x48/0x3a0 lr : device_del+0x44/0x3a0 Call trace: device_del+0x48/0x3a0 attribute_container_class_device_del+0x28/0x40 transport_remove_classdev+0x60/0x7c attribute_container_device_trigger+0x118/0x120 transport_remove_device+0x20/0x30 ata_tdev_delete+0x24/0x50 [libata] ata_tlink_delete+0x40/0xa0 [libata] ata_tport_delete+0x2c/0x60 [libata] ata_port_detach+0x148/0x1b0 [libata] ata_pci_remove_one+0x50/0x80 [libata] ahci_remove_one+0x4c/0x8c [ahci] Fix this by checking and handling return value of transport_add_device() in ata_tdev_add(). In the error path, device_del() is called to delete the device which was added earlier in this function, and ata_tdev_free() is called to free ata_dev. Fixes: d902747 ("[libata] Add ATA transport class") Signed-off-by: Yang Yingliang <[email protected]> Signed-off-by: Damien Le Moal <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 67b2193 commit f23058d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/ata/libata-transport.c

+7-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,13 @@ static int ata_tdev_add(struct ata_device *ata_dev)
683683
return error;
684684
}
685685

686-
transport_add_device(dev);
686+
error = transport_add_device(dev);
687+
if (error) {
688+
device_del(dev);
689+
ata_tdev_free(ata_dev);
690+
return error;
691+
}
692+
687693
transport_configure_device(dev);
688694
return 0;
689695
}

0 commit comments

Comments
 (0)