[kernel] r18479 - in dists/squeeze-security/linux-2.6/debian/patches: bugfix/all series

[Dann Frazier]

Author: dannf
Date: Sun Jan  8 21:27:33 2012
New Revision: 18479

Log:
Revert the ub_bd_ioctl() removal so that we return to using the correct
type for the last parameter in the locked_ioctl op.

Added:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/revert-ub_bd_ioctl-removal.patch
Modified:
   dists/squeeze-security/linux-2.6/debian/patches/series/39squeeze1

Added: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/revert-ub_bd_ioctl-removal.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/revert-ub_bd_ioctl-removal.patch	Sun Jan  8 21:27:33 2012	(r18479)
@@ -0,0 +1,32 @@
+diff --git a/drivers/block/ub.c b/drivers/block/ub.c
+index 5e0ac9a..1bdf2ca 100644
+--- a/drivers/block/ub.c
++++ b/drivers/block/ub.c
+@@ -1721,6 +1721,18 @@ static int ub_bd_release(struct gendisk *disk, fmode_t mode)
+ }
+ 
+ /*
++ * The ioctl interface.
++ */
++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;
++
++	return scsi_cmd_blk_ioctl(disk->queue, disk, mode, cmd, usermem);
++}
++
++/*
+  * This is called by check_disk_change if we reported a media change.
+  * The main onjective here is to discover the features of the media such as
+  * the capacity, read-only status, etc. USB storage generally does not
+@@ -1781,7 +1793,7 @@ static const struct block_device_operations ub_bd_fops = {
+ 	.owner		= THIS_MODULE,
+ 	.open		= ub_bd_open,
+ 	.release	= ub_bd_release,
+-	.locked_ioctl	= scsi_cmd_blk_ioctl,
++	.locked_ioctl	= ub_bd_ioctl,
+ 	.media_changed	= ub_bd_media_changed,
+ 	.revalidate_disk = ub_bd_revalidate,
+ };

Modified: dists/squeeze-security/linux-2.6/debian/patches/series/39squeeze1
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/series/39squeeze1	Sun Jan  8 10:53:26 2012	(r18478)
+++ dists/squeeze-security/linux-2.6/debian/patches/series/39squeeze1	Sun Jan  8 21:27:33 2012	(r18479)
@@ -1,6 +1,7 @@
 + bugfix/all/add-scsi_cmd_blk_ioctl-wrapper.patch
 + bugfix/all/limit-ioctls-forwarded-to-non-scsi-devices.patch
 + bugfix/all/treat-lvs-on-one-pv-like-a-partition.patch
++ bugfix/all/revert-ub_bd_ioctl-removal.patch
 + bugfix/all/xfs-fix-possible-memory-corruption-in-xfs_readlink.patch
 + bugfix/all/KEYS-Fix-a-NULL-pointer-deref-in-the-user-defined-key-type.patch
 + bugfix/x86/kvm-prevent-starting-pit-timers-in-the-absence-of-irqchip-support.patch