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

Commit 577ebb37 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Linus Torvalds
Browse files

block: add and use scsi_blk_cmd_ioctl 



Introduce a wrapper around scsi_cmd_ioctl that takes a block device.

The function will then be enhanced to detect partition block devices
and, in that case, subject the ioctls to whitelisting.

Cc: linux-scsi@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Cc: James Bottomley <JBottomley@parallels.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 81d48f0a

block/scsi_ioctl.c

+7 −0
Original line number Diff line number Diff line
@@ -690,6 +690,13 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod 
}

EXPORT_SYMBOL(scsi_cmd_ioctl);



int scsi_cmd_blk_ioctl(struct block_device *bd, fmode_t mode,

		       unsigned int cmd, void __user *arg)

{

	return scsi_cmd_ioctl(bd->bd_disk->queue, bd->bd_disk, mode, cmd, arg);

}

EXPORT_SYMBOL(scsi_cmd_blk_ioctl);



static int __init blk_scsi_ioctl_init(void)

{

	blk_set_cmd_filter_defaults(&blk_default_cmd_filter);

drivers/block/cciss.c

+3 −3
Original line number Diff line number Diff line
@@ -1735,7 +1735,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, 
	case CCISS_BIG_PASSTHRU:

		return cciss_bigpassthru(h, argp);



	/* scsi_cmd_ioctl handles these, below, though some are not */

	/* scsi_cmd_blk_ioctl handles these, below, though some are not */

	/* very meaningful for cciss.  SG_IO is the main one people want. */



	case SG_GET_VERSION_NUM:
@@ -1746,9 +1746,9 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, 
	case SG_EMULATED_HOST:

	case SG_IO:

	case SCSI_IOCTL_SEND_COMMAND:

		return scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);

		return scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);



	/* scsi_cmd_ioctl would normally handle these, below, but */

	/* scsi_cmd_blk_ioctl would normally handle these, below, but */

	/* they aren't a good fit for cciss, as CD-ROMs are */

	/* not supported, and we don't have any bus/target/lun */

	/* which we present to the kernel. */

drivers/block/ub.c

+1 −2
Original line number Diff line number Diff line
@@ -1744,12 +1744,11 @@ static int ub_bd_release(struct gendisk *disk, fmode_t mode) 
static int ub_bd_ioctl(struct block_device *bdev, fmode_t mode,

    unsigned int cmd, unsigned long arg)

{

	struct gendisk *disk = bdev->bd_disk;

	void __user *usermem = (void __user *) arg;

	int ret;



	mutex_lock(&ub_mutex);

	ret = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, usermem);

	ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, usermem);

	mutex_unlock(&ub_mutex);



	return ret;

drivers/block/virtio_blk.c

+2 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode, 
	if (!virtio_has_feature(vblk->vdev, VIRTIO_BLK_F_SCSI))

		return -ENOTTY;



	return scsi_cmd_ioctl(disk->queue, disk, mode, cmd,

	return scsi_cmd_blk_ioctl(bdev, mode, cmd,

				  (void __user *)data);

}

drivers/cdrom/cdrom.c

+1 −2
Original line number Diff line number Diff line
@@ -2746,12 +2746,11 @@ int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, 
{

	void __user *argp = (void __user *)arg;

	int ret;

	struct gendisk *disk = bdev->bd_disk;



	/*

	 * Try the generic SCSI command ioctl's first.

	 */

	ret = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);

	ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);

	if (ret != -ENOTTY)

		return ret;