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 11:03:41 -0700
commita8139b5b8b1355c4909d90afa58b055aabe1a272 (patch)
tree6c454bbd3770b399a90b08396926d68135330f8c /block
parent5f855daf6487b64eae1f201483b5830f42b2e9bb (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 60108d9fa04..d815a0fb52d 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -518,7 +518,7 @@ static 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);