diff options
| author | Maurizio Lombardi <mlombard@redhat.com> | 2017-06-27 11:53:27 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-09-10 10:59:15 -0400 |
| commit | a3676638f35812f12f025d1ee80547c993033640 (patch) | |
| tree | 549649bd973aae7b99dd78934849cfc3647408de | |
| parent | 8bce8209ca833e7e73210d66c73b3bc018ecc22f (diff) | |
scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails.
[ Upstream commit 62e62ffd95539b9220894a7900a619e0f3ef4756 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/misc/enclosure.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c index 65fed7146e9b..cc91f7b3d90c 100644 --- a/drivers/misc/enclosure.c +++ b/drivers/misc/enclosure.c @@ -375,6 +375,7 @@ int enclosure_add_device(struct enclosure_device *edev, int component, struct device *dev) { struct enclosure_component *cdev; + int err; if (!edev || component >= edev->components) return -EINVAL; @@ -384,12 +385,17 @@ int enclosure_add_device(struct enclosure_device *edev, int component, if (cdev->dev == dev) return -EEXIST; - if (cdev->dev) + if (cdev->dev) { enclosure_remove_links(cdev); - - put_device(cdev->dev); + put_device(cdev->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); |