提交 e8109402 编写于 作者: Y Yang Yingliang 提交者: sanglipeng

ata: libata-transport: fix error handling in ata_tlink_add()

stable inclusion
from stable-v5.10.156
commit 7377a14598f6b04446c54bc4a50cd249470d6c6f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7MCG1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7377a14598f6b04446c54bc4a50cd249470d6c6f

--------------------------------

[ Upstream commit cf0816f6 ]

In ata_tlink_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: 33 PID: 13850 Comm: rmmod Kdump: loaded Tainted: G        W          6.1.0-rc3+ #12
pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : device_del+0x48/0x39c
lr : device_del+0x44/0x39c
Call trace:
 device_del+0x48/0x39c
 attribute_container_class_device_del+0x28/0x40
 transport_remove_classdev+0x60/0x7c
 attribute_container_device_trigger+0x118/0x120
 transport_remove_device+0x20/0x30
 ata_tlink_delete+0x88/0xb0 [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_tlink_add().

Fixes: d9027470 ("[libata] Add ATA transport class")
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NDamien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: Nsanglipeng <sanglipeng1@jd.com>
上级 46e8b222
...@@ -428,7 +428,9 @@ int ata_tlink_add(struct ata_link *link) ...@@ -428,7 +428,9 @@ int ata_tlink_add(struct ata_link *link)
goto tlink_err; goto tlink_err;
} }
transport_add_device(dev); error = transport_add_device(dev);
if (error)
goto tlink_transport_err;
transport_configure_device(dev); transport_configure_device(dev);
ata_for_each_dev(ata_dev, link, ALL) { ata_for_each_dev(ata_dev, link, ALL) {
...@@ -443,6 +445,7 @@ int ata_tlink_add(struct ata_link *link) ...@@ -443,6 +445,7 @@ int ata_tlink_add(struct ata_link *link)
ata_tdev_delete(ata_dev); ata_tdev_delete(ata_dev);
} }
transport_remove_device(dev); transport_remove_device(dev);
tlink_transport_err:
device_del(dev); device_del(dev);
tlink_err: tlink_err:
transport_destroy_device(dev); transport_destroy_device(dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册