From 134cbf552295204ea9b17882580acf800b30eaff Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 3 Jul 2013 22:01:14 +0000 Subject: 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 Cc: Jens Axboe Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds [jmm: Backport to 2.6.32] Signed-off-by: Willy Tarreau --- drivers/block/nbd.c | 4 +++- fs/partitions/check.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 26ada4762fa3..90550ba8347a 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -655,7 +655,9 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo, mutex_unlock(&lo->tx_lock); - thread = kthread_create(nbd_thread, lo, lo->disk->disk_name); + thread = kthread_create(nbd_thread, lo, "%s", + lo->disk->disk_name); + if (IS_ERR(thread)) { mutex_lock(&lo->tx_lock); return PTR_ERR(thread); diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 7b685e10cbad..aa90d88118e3 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -476,7 +476,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); -- cgit v1.2.3