X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fblock%2Fioctl.c;h=283a9f2facbada3b18a37fe13c1e142508857b22;hb=da7238bfbc1c5267bb3c9a79e03b6c296839a07e;hp=b813739b3890711fa6ae1fdc165c8b45e40bcd73;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git

diff --git a/drivers/block/ioctl.c b/drivers/block/ioctl.c
index b813739b3..283a9f2fa 100644
--- a/drivers/block/ioctl.c
+++ b/drivers/block/ioctl.c
@@ -5,7 +5,7 @@
 #include <linux/buffer_head.h>
 #include <asm/uaccess.h>
 
-static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg *arg)
+static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user *arg)
 {
 	struct block_device *bdevp;
 	struct gendisk *disk;
@@ -109,27 +109,27 @@ static int blkdev_reread_part(struct block_device *bdev)
 
 static int put_ushort(unsigned long arg, unsigned short val)
 {
-	return put_user(val, (unsigned short *)arg);
+	return put_user(val, (unsigned short __user *)arg);
 }
 
 static int put_int(unsigned long arg, int val)
 {
-	return put_user(val, (int *)arg);
+	return put_user(val, (int __user *)arg);
 }
 
 static int put_long(unsigned long arg, long val)
 {
-	return put_user(val, (long *)arg);
+	return put_user(val, (long __user *)arg);
 }
 
 static int put_ulong(unsigned long arg, unsigned long val)
 {
-	return put_user(val, (unsigned long *)arg);
+	return put_user(val, (unsigned long __user *)arg);
 }
 
 static int put_u64(unsigned long arg, u64 val)
 {
-	return put_user(val, (u64 *)arg);
+	return put_user(val, (u64 __user *)arg);
 }
 
 int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
@@ -172,7 +172,7 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
 			return -EACCES;
 		if (!arg)
 			return -EINVAL;
-		if (get_user(n, (int *) arg))
+		if (get_user(n, (int __user *) arg))
 			return -EFAULT;
 		if (bd_claim(bdev, file) < 0)
 			return -EBUSY;
@@ -180,7 +180,7 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
 		bd_release(bdev);
 		return ret;
 	case BLKPG:
-		return blkpg_ioctl(bdev, (struct blkpg_ioctl_arg *) arg);
+		return blkpg_ioctl(bdev, (struct blkpg_ioctl_arg __user *) arg);
 	case BLKRRPART:
 		return blkdev_reread_part(bdev);
 	case BLKGETSIZE:
@@ -203,12 +203,13 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
 	case BLKROSET:
 		if (disk->fops->ioctl) {
 			ret = disk->fops->ioctl(inode, file, cmd, arg);
-			if (ret != -EINVAL)
+			/* -EINVAL to handle old uncorrected drivers */
+			if (ret != -EINVAL && ret != -ENOTTY)
 				return ret;
 		}
 		if (!capable(CAP_SYS_ADMIN))
 			return -EACCES;
-		if (get_user(n, (int *)(arg)))
+		if (get_user(n, (int __user *)(arg)))
 			return -EFAULT;
 		set_device_ro(bdev, n);
 		return 0;