3.2-stable patches

added patches:
	block-add-and-use-scsi_blk_cmd_ioctl.patch

diff --git a/queue-3.2/block-add-and-use-scsi_blk_cmd_ioctl.patch b/queue-3.2/block-add-and-use-scsi_blk_cmd_ioctl.patch
new file mode 100644 (file)
index 0000000..3d0463d
--- /dev/null
+++ b/queue-3.2/block-add-and-use-scsi_blk_cmd_ioctl.patch
@@ -0,0 +1,150 @@
+From 577ebb374c78314ac4617242f509e2f5e7156649 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Thu, 12 Jan 2012 16:01:27 +0100
+Subject: block: add and use scsi_blk_cmd_ioctl
+
+From: Paolo Bonzini <pbonzini@redhat.com>
+
+commit 577ebb374c78314ac4617242f509e2f5e7156649 upstream.
+
+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: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ block/scsi_ioctl.c             |    7 +++++++
+ drivers/block/cciss.c          |    6 +++---
+ drivers/block/ub.c             |    3 +--
+ drivers/block/virtio_blk.c     |    4 ++--
+ drivers/cdrom/cdrom.c          |    3 +--
+ drivers/ide/ide-floppy_ioctl.c |    3 +--
+ drivers/scsi/sd.c              |    2 +-
+ include/linux/blkdev.h         |    2 ++
+ 8 files changed, 18 insertions(+), 12 deletions(-)
+
+--- a/block/scsi_ioctl.c
++++ b/block/scsi_ioctl.c
+@@ -690,6 +690,13 @@ int scsi_cmd_ioctl(struct request_queue
+ }
+ 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);
+--- a/drivers/block/cciss.c
++++ b/drivers/block/cciss.c
+@@ -1735,7 +1735,7 @@ static int cciss_ioctl(struct block_devi
+       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_devi
+       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. */
+--- a/drivers/block/ub.c
++++ b/drivers/block/ub.c
+@@ -1744,12 +1744,11 @@ static int ub_bd_release(struct gendisk
+ 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;
+--- a/drivers/block/virtio_blk.c
++++ b/drivers/block/virtio_blk.c
+@@ -243,8 +243,8 @@ static int virtblk_ioctl(struct block_de
+       if (!virtio_has_feature(vblk->vdev, VIRTIO_BLK_F_SCSI))
+               return -ENOTTY;
+ 
+-      return scsi_cmd_ioctl(disk->queue, disk, mode, cmd,
+-                            (void __user *)data);
++      return scsi_cmd_blk_ioctl(bdev, mode, cmd,
++                                (void __user *)data);
+ }
+ 
+ /* We provide getgeo only to please some old bootloader/partitioning tools */
+--- a/drivers/cdrom/cdrom.c
++++ b/drivers/cdrom/cdrom.c
+@@ -2747,12 +2747,11 @@ int cdrom_ioctl(struct cdrom_device_info
+ {
+       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;
+ 
+--- a/drivers/ide/ide-floppy_ioctl.c
++++ b/drivers/ide/ide-floppy_ioctl.c
+@@ -292,8 +292,7 @@ int ide_floppy_ioctl(ide_drive_t *drive,
+        * and CDROM_SEND_PACKET (legacy) ioctls
+        */
+       if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
+-              err = scsi_cmd_ioctl(bdev->bd_disk->queue, bdev->bd_disk,
+-                              mode, cmd, argp);
++              err = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
+ 
+       if (err == -ENOTTY)
+               err = generic_ide_ioctl(drive, bdev, cmd, arg);
+--- a/drivers/scsi/sd.c
++++ b/drivers/scsi/sd.c
+@@ -1096,7 +1096,7 @@ static int sd_ioctl(struct block_device
+                       error = scsi_ioctl(sdp, cmd, p);
+                       break;
+               default:
+-                      error = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, p);
++                      error = scsi_cmd_blk_ioctl(bdev, mode, cmd, p);
+                       if (error != -ENOTTY)
+                               break;
+                       error = scsi_ioctl(sdp, cmd, p);
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -675,6 +675,8 @@ extern int blk_insert_cloned_request(str
+                                    struct request *rq);
+ extern void blk_delay_queue(struct request_queue *, unsigned long);
+ extern void blk_recount_segments(struct request_queue *, struct bio *);
++extern int scsi_cmd_blk_ioctl(struct block_device *, fmode_t,
++                            unsigned int, void __user *);
+ extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
+                         unsigned int, void __user *);
+ extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,

diff --git a/queue-3.2/series b/queue-3.2/series
index 3045f8af5b5a6ad72a59acce2eb08cc81d9158a2..67514967ff0c87c918f67fda097f9e7ce6fbc12c 100644 (file)
--- a/queue-3.2/series
+++ b/queue-3.2/series
@@ -87,3 +87,4 @@ hid-multitouch-add-support-of-atmel-multitouch-panels.patch
 hid-multitouch-add-support-for-3m-32.patch
 hid-hid-multitouch-add-support-9-new-xiroku-devices.patch
 fix-cputime-overflow-in-uptime_proc_show.patch
+block-add-and-use-scsi_blk_cmd_ioctl.patch