aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-07-03 18:04:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 19:07:41 -0400
commit02aa2a37636c8fa4fb9322d91be46ff8225b7de0 (patch)
tree97c93d17cfcad186d229ef76f96de709eddfea8c /drivers/scsi/sd.c
parent096a8aac6bf4a5a0b2ef812ad76d056bbf3fb2af (diff)
drivers: avoid format string in dev_set_name
Calling dev_set_name with a single paramter causes it to be handled as a format string. Many callers are passing potentially dynamic string content, so use "%s" in those cases to avoid any potential accidents, including wrappers like device_create*() and bdi_register(). Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index c1c555242d0d..8fa3d0b73ad9 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2931,7 +2931,7 @@ static int sd_probe(struct device *dev)
2931 device_initialize(&sdkp->dev); 2931 device_initialize(&sdkp->dev);
2932 sdkp->dev.parent = dev; 2932 sdkp->dev.parent = dev;
2933 sdkp->dev.class = &sd_disk_class; 2933 sdkp->dev.class = &sd_disk_class;
2934 dev_set_name(&sdkp->dev, dev_name(dev)); 2934 dev_set_name(&sdkp->dev, "%s", dev_name(dev));
2935 2935
2936 if (device_add(&sdkp->dev)) 2936 if (device_add(&sdkp->dev))
2937 goto out_free_index; 2937 goto out_free_index;