summaryrefslogtreecommitdiffstats
path: root/block/genhd.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-07-03 15:01:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:25 -0700
commitffc8b30866879ed9ba62bd0a86fecdbd51cd3d19 (patch)
tree21fdc09c7011ed9a1b85e98f7718a58a2c903d32 /block/genhd.c
parent542db01579fbb7ea7d1f7bb9ddcef1559df660b2 (diff)
downloadop-kernel-dev-ffc8b30866879ed9ba62bd0a86fecdbd51cd3d19.zip
op-kernel-dev-ffc8b30866879ed9ba62bd0a86fecdbd51cd3d19.tar.gz
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 'block/genhd.c')
-rw-r--r--block/genhd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c
index e9094b3..dadf42b 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -512,7 +512,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);
OpenPOWER on IntegriCloud