diff options
author | Kees Cook <keescook@chromium.org> | 2013-07-03 18:01:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-13 14:42:26 -0400 |
commit | 88ce7cf76ced99962699d0ebb4d47d6a88b94c29 (patch) | |
tree | f55e59db7fc04ebca71354ab4a529fc682a4ec09 /block/genhd.c | |
parent | 70621db0945635044214766b42e2dfca0d673929 (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/genhd.c')
-rw-r--r-- | block/genhd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c index 20625eed5511..cdeb5277dfd4 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -512,7 +512,7 @@ static void register_disk(struct gendisk *disk) | |||
512 | 512 | ||
513 | ddev->parent = disk->driverfs_dev; | 513 | ddev->parent = disk->driverfs_dev; |
514 | 514 | ||
515 | dev_set_name(ddev, disk->disk_name); | 515 | dev_set_name(ddev, "%s", disk->disk_name); |
516 | 516 | ||
517 | /* delay uevents, until we scanned partition table */ | 517 | /* delay uevents, until we scanned partition table */ |
518 | dev_set_uevent_suppress(ddev, 1); | 518 | dev_set_uevent_suppress(ddev, 1); |