system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-20 19:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails.

Browse source 
The enclosure_add_device() function should fail if it can't create the
relevant sysfs links.

Cc: <stable@vger.kernel.org>
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Tested-by: Douglas Miller <dougmill@linux.vnet.ibm.com>
Acked-by: James Bottomley <jejb@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Maurizio Lombardi 2017-06-27 11:53:27 +02:00 committed by Martin K. Petersen
parent 8dc0da7981
commit 62e62ffd95
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/misc/enclosure.c
View file

@ -375,6 +375,7 @@ int enclosure_add_device(struct enclosure_device *edev, int component,
struct device *dev) struct device *dev)
{ {
struct enclosure_component *cdev; struct enclosure_component *cdev;
int err;
if (!edev || component >= edev->components) if (!edev || component >= edev->components)
return -EINVAL; return -EINVAL;
@ -384,12 +385,17 @@ int enclosure_add_device(struct enclosure_device *edev, int component,
if (cdev->dev == dev) if (cdev->dev == dev)
return -EEXIST; return -EEXIST;
if (cdev->dev) if (cdev->dev) {
enclosure_remove_links(cdev); enclosure_remove_links(cdev);
put_device(cdev->dev);
put_device(cdev->dev); }
cdev->dev = get_device(dev); cdev->dev = get_device(dev);
return enclosure_add_links(cdev); err = enclosure_add_links(cdev);
if (err) {
put_device(cdev->dev);
cdev->dev = NULL;
}
return err;
} }
EXPORT_SYMBOL_GPL(enclosure_add_device); EXPORT_SYMBOL_GPL(enclosure_add_device);