From: James Bottomley Date: Thu, 9 Jan 2020 01:21:32 +0000 (-0800) Subject: scsi: enclosure: Fix stale device oops with hot replug X-Git-Tag: v5.5-rc7~39^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=529244bd1afc102ab164429d338d310d5d65e60d;p=users%2Fdwmw2%2Flinux.git scsi: enclosure: Fix stale device oops with hot replug Doing an add/remove/add on a SCSI device in an enclosure leads to an oops caused by poisoned values in the enclosure device list pointers. The reason is because we are keeping the enclosure device across the enclosed device add/remove/add but the current code is doing a device_add/device_del/device_add on it. This is the wrong thing to do in sysfs, so fix it by not doing a device_del on the enclosure device simply because of a hot remove of the drive in the slot. [mkp: added missing email addresses] Fixes: 43d8eb9cfd0a ("[SCSI] ses: add support for enclosure component hot removal") Link: https://lore.kernel.org/r/1578532892.3852.10.camel@HansenPartnership.com Signed-off-by: James Bottomley Reported-by: Luo Jiaxing Tested-by: John Garry Signed-off-by: Martin K. Petersen --- diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c index 6d27ccfe06802..3c2d405bc79b9 100644 --- a/drivers/misc/enclosure.c +++ b/drivers/misc/enclosure.c @@ -406,10 +406,9 @@ int enclosure_remove_device(struct enclosure_device *edev, struct device *dev) cdev = &edev->component[i]; if (cdev->dev == dev) { enclosure_remove_links(cdev); - device_del(&cdev->cdev); put_device(dev); cdev->dev = NULL; - return device_add(&cdev->cdev); + return 0; } } return -ENODEV;