aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-07-03 15:01:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-13 10:34:43 -0700
commitcb065a908d47441cfc660d1cc0a50fceefa0cda0 (patch)
treeff58671939041514436aaf1adfbc9b1aa7cacd26 /block
parentc55035cb085d79311a429129183f43b85bac3994 (diff)
block: do not pass disk names as format strings
commit ffc8b30866879ed9ba62bd0a86fecdbd51cd3d19 upstream. 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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c
index d7f7d4e3da3..e9a5220960b 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -518,7 +518,7 @@ void register_disk(struct gendisk *disk)
ddev->parent = disk->driverfs_dev;
- dev_set_name(ddev, disk->disk_name);
+ dev_set_name(ddev, "%s", disk->disk_name);
/* delay uevents, until we scanned partition table */
dev_set_uevent_suppress(ddev, 1);