compat_ioctl: move BLKPG handling to block/compat_ioctl.c

BLKPG is common to all block devices, so it should be handled
by common code.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 31 insertions, 0 deletions

diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
index 5c6dafaad938..44807d38b1e7 100644
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -92,6 +92,35 @@ static int compat_hdio_ioctl(struct inode *inode, struct file *file,
         return error;
 }
 
+struct compat_blkpg_ioctl_arg {
+        compat_int_t op;
+        compat_int_t flags;
+        compat_int_t datalen;
+        compat_caddr_t data;
+};
+
+static int compat_blkpg_ioctl(struct inode *inode, struct file *file,
+                unsigned int cmd, struct compat_blkpg_ioctl_arg __user *ua32)
+{
+        struct blkpg_ioctl_arg __user *a = compat_alloc_user_space(sizeof(*a));
+        compat_caddr_t udata;
+        compat_int_t n;
+        int err;
+
+        err = get_user(n, &ua32->op);
+        err |= put_user(n, &a->op);
+        err |= get_user(n, &ua32->flags);
+        err |= put_user(n, &a->flags);
+        err |= get_user(n, &ua32->datalen);
+        err |= put_user(n, &a->datalen);
+        err |= get_user(udata, &ua32->data);
+        err |= put_user(compat_ptr(udata), &a->data);
+        if (err)
+                return err;
+
+        return blkdev_ioctl(inode, file, cmd, (unsigned long)a);
+}
+
 #define BLKBSZGET_32            _IOR(0x12, 112, int)
 #define BLKBSZSET_32            _IOW(0x12, 113, int)
 #define BLKGETSIZE64_32         _IOR(0x12, 114, int)
@@ -348,6 +377,8 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
         case BLKBSZSET_32:
                 return blkdev_ioctl(inode, file, BLKBSZSET,
                                 (unsigned long)compat_ptr(arg));
+        case BLKPG:
+                return compat_blkpg_ioctl(inode, file, cmd, compat_ptr(arg));
         }
 
         lock_kernel();