scsi: ses check name in enclosure_component_register()

PATCH In review [email protected] 1 participant 1 message May 12, 2009

Subsystems (2)

SCSI Char and misc drivers

lore

Share & tools

lore

[email protected]

author

2009-05-12 21:31 UTC #0 lore raw

PATCH 8/9 scsi: ses check name in enclosure_component_register()

From: Yinghai Lu <[email protected]>

dev_set_name will use sprintf to copy the name. need to check if the name does valid.

Otherwise the code will error from device_add() later.

Signed-off-by Yinghai Lu <[email protected]>

Cc James Bottomley <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/misc/enclosure.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/misc/enclosure.c renamed from drivers/misc/enclosure.c~scsi-ses-check-name-in-enclosure_component_register-v2 +3 -3

diff -puN drivers/misc/enclosure.c~scsi-ses-check-name-in-enclosure_component_register-v2 drivers/misc/enclosure.c
@@ -119,7 +119,7 @@ enclosure_register(struct device *dev, c
 	edev->edev.class = &enclosure_class;
 	edev->edev.parent = get_device(dev);
 	edev->cb = cb;
-	dev_set_name(&edev->edev, name);
+	dev_set_name(&edev->edev, "%s", name);
 	err = device_register(&edev->edev);
 	if (err)
 		goto err;

@@ -255,8 +255,8 @@ enclosure_component_register(struct encl
 	ecomp->number = number;
 	cdev = &ecomp->cdev;
 	cdev->parent = get_device(&edev->edev);
-	if (name)
-		dev_set_name(cdev, name);
+	if (name && name[0])
+		dev_set_name(cdev, "%s", name);
 	else
 		dev_set_name(cdev, "%u", number);