aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/osd/osd_uld.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-07-03 18:01:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 19:07:25 -0400
commitffc8b30866879ed9ba62bd0a86fecdbd51cd3d19 (patch)
tree21fdc09c7011ed9a1b85e98f7718a58a2c903d32 /drivers/scsi/osd/osd_uld.c
parent542db01579fbb7ea7d1f7bb9ddcef1559df660b2 (diff)
block: do not pass disk names as format strings
Disk names may contain arbitrary strings, so they must not be interpreted as format strings. It seems that only md allows arbitrary strings to be used for disk names, but this could allow for a local memory corruption from uid 0 into ring 0. CVE-2013-2851 Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Jens Axboe <axboe@kernel.dk> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/osd/osd_uld.c')
-rw-r--r--drivers/scsi/osd/osd_uld.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index 0fab6b5c7b82..9d86947d67fe 100644
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -485,7 +485,7 @@ static int osd_probe(struct device *dev)
485 oud->class_dev.class = &osd_uld_class; 485 oud->class_dev.class = &osd_uld_class;
486 oud->class_dev.parent = dev; 486 oud->class_dev.parent = dev;
487 oud->class_dev.release = __remove; 487 oud->class_dev.release = __remove;
488 error = dev_set_name(&oud->class_dev, disk->disk_name); 488 error = dev_set_name(&oud->class_dev, "%s", disk->disk_name);
489 if (error) { 489 if (error) {
490 OSD_ERR("dev_set_name failed => %d\n", error); 490 OSD_ERR("dev_set_name failed => %d\n", error);
491 goto err_put_cdev; 491 goto err_put_cdev;