Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffc8b308 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 542db015

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/block/nbd.c

+2 −1
Original line number Diff line number Diff line
@@ -714,7 +714,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, 
		else

			blk_queue_flush(nbd->disk->queue, 0);



		thread = kthread_create(nbd_thread, nbd, nbd->disk->disk_name);

		thread = kthread_create(nbd_thread, nbd, "%s",

					nbd->disk->disk_name);

		if (IS_ERR(thread)) {

			mutex_lock(&nbd->tx_lock);

			return PTR_ERR(thread);

drivers/scsi/osd/osd_uld.c

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static int osd_probe(struct device *dev) 
	oud->class_dev.class = &osd_uld_class;

	oud->class_dev.parent = dev;

	oud->class_dev.release = __remove;

	error = dev_set_name(&oud->class_dev, disk->disk_name);

	error = dev_set_name(&oud->class_dev, "%s", disk->disk_name);

	if (error) {

		OSD_ERR("dev_set_name failed => %d\n", error);

		goto err_put_cdev;