aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-07-03 18:01:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 19:07:25 -0400
commitffc8b30866879ed9ba62bd0a86fecdbd51cd3d19 (patch)
tree21fdc09c7011ed9a1b85e98f7718a58a2c903d32 /drivers/block
parent542db01579fbb7ea7d1f7bb9ddcef1559df660b2 (diff)
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 'drivers/block')
-rw-r--r--drivers/block/nbd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 037288e7874d..46b35f7acfde 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -714,7 +714,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
714 else 714 else
715 blk_queue_flush(nbd->disk->queue, 0); 715 blk_queue_flush(nbd->disk->queue, 0);
716 716
717 thread = kthread_create(nbd_thread, nbd, nbd->disk->disk_name); 717 thread = kthread_create(nbd_thread, nbd, "%s",
718 nbd->disk->disk_name);
718 if (IS_ERR(thread)) { 719 if (IS_ERR(thread)) {
719 mutex_lock(&nbd->tx_lock); 720 mutex_lock(&nbd->tx_lock);
720 return PTR_ERR(thread); 721 return PTR_ERR(thread);