usbdevfs: move compat_ioctl handling to devio.c

[pandora-kernel.git] / drivers / usb / core / devio.c

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 181f78c..6e8bcdf 100644 (file)
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1388,6 +1388,46 @@ static int proc_reapurbnonblock(struct dev_state *ps, void __user *arg)
 }
 
 #ifdef CONFIG_COMPAT
+static int proc_control_compat(struct dev_state *ps,
+                               struct usbdevfs_ctrltransfer32 __user *p32)
+{
+        struct usbdevfs_ctrltransfer __user *p;
+        __u32 udata;
+        p = compat_alloc_user_space(sizeof(*p));
+        if (copy_in_user(p, p32, (sizeof(*p32) - sizeof(compat_caddr_t))) ||
+            get_user(udata, &p32->data) ||
+           put_user(compat_ptr(udata), &p->data))
+               return -EFAULT;
+        return proc_control(ps, p);
+}
+
+static int proc_bulk_compat(struct dev_state *ps,
+                       struct usbdevfs_bulktransfer32 __user *p32)
+{
+        struct usbdevfs_bulktransfer __user *p;
+        compat_uint_t n;
+        compat_caddr_t addr;
+
+        p = compat_alloc_user_space(sizeof(*p));
+
+        if (get_user(n, &p32->ep) || put_user(n, &p->ep) ||
+            get_user(n, &p32->len) || put_user(n, &p->len) ||
+            get_user(n, &p32->timeout) || put_user(n, &p->timeout) ||
+            get_user(addr, &p32->data) || put_user(compat_ptr(addr), &p->data))
+                return -EFAULT;
+
+        return proc_bulk(ps, p);
+}
+static int proc_disconnectsignal_compat(struct dev_state *ps, void __user *arg)
+{
+       struct usbdevfs_disconnectsignal32 ds;
+
+       if (copy_from_user(&ds, arg, sizeof(ds)))
+               return -EFAULT;
+       ps->discsignr = ds.signr;
+       ps->disccontext = compat_ptr(ds.context);
+       return 0;
+}
 
 static int get_urb32(struct usbdevfs_urb *kurb,
                     struct usbdevfs_urb32 __user *uurb)
@@ -1482,6 +1522,7 @@ static int proc_reapurbnonblock_compat(struct dev_state *ps, void __user *arg)
        return processcompl_compat(as, (void __user * __user *)arg);
 }
 
+
 #endif
 
 static int proc_disconnectsignal(struct dev_state *ps, void __user *arg)
@@ -1648,12 +1689,12 @@ static int proc_release_port(struct dev_state *ps, void __user *arg)
  * are assuming that somehow the configuration has been prevented from
  * changing.  But there's no mechanism to ensure that...
  */
-static int usbdev_ioctl(struct inode *inode, struct file *file,
-                       unsigned int cmd, unsigned long arg)
+static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
+                               void __user *p)
 {
        struct dev_state *ps = file->private_data;
+       struct inode *inode = file->f_path.dentry->d_inode;
        struct usb_device *dev = ps->dev;
-       void __user *p = (void __user *)arg;
        int ret = -ENOTTY;
 
        if (!(file->f_mode & FMODE_WRITE))
@@ -1726,6 +1767,24 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
                break;
 
 #ifdef CONFIG_COMPAT
+       case USBDEVFS_CONTROL32:
+               snoop(&dev->dev, "%s: CONTROL32\n", __func__);
+               ret = proc_control_compat(ps, p);
+               if (ret >= 0)
+                       inode->i_mtime = CURRENT_TIME;
+               break;
+
+       case USBDEVFS_BULK32:
+               snoop(&dev->dev, "%s: BULK32\n", __func__);
+               ret = proc_bulk_compat(ps, p);
+               if (ret >= 0)
+                       inode->i_mtime = CURRENT_TIME;
+               break;
+
+       case USBDEVFS_DISCSIGNAL32:
+               snoop(&dev->dev, "%s: DISCSIGNAL32\n", __func__);
+               ret = proc_disconnectsignal_compat(ps, p);
+               break;
 
        case USBDEVFS_SUBMITURB32:
                snoop(&dev->dev, "%s: SUBMITURB32\n", __func__);
@@ -1745,7 +1804,7 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
                break;
 
        case USBDEVFS_IOCTL32:
-               snoop(&dev->dev, "%s: IOCTL\n", __func__);
+               snoop(&dev->dev, "%s: IOCTL32\n", __func__);
                ret = proc_ioctl_compat(ps, ptr_to_compat(p));
                break;
 #endif
@@ -1801,6 +1860,32 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
        return ret;
 }
 
+static long usbdev_ioctl(struct file *file, unsigned int cmd,
+                       unsigned long arg)
+{
+       int ret;
+
+       lock_kernel();
+       ret = usbdev_do_ioctl(file, cmd, (void __user *)arg);
+       unlock_kernel();
+
+       return ret;
+}
+
+#ifdef CONFIG_COMPAT
+static long usbdev_compat_ioctl(struct file *file, unsigned int cmd,
+                       unsigned long arg)
+{
+       int ret;
+
+       lock_kernel();
+       ret = usbdev_do_ioctl(file, cmd, compat_ptr(arg));
+       unlock_kernel();
+
+       return ret;
+}
+#endif
+
 /* No kernel lock - fine */
 static unsigned int usbdev_poll(struct file *file,
                                struct poll_table_struct *wait)
@@ -1817,13 +1902,16 @@ static unsigned int usbdev_poll(struct file *file,
 }
 
 const struct file_operations usbdev_file_operations = {
-       .owner =        THIS_MODULE,
-       .llseek =       usbdev_lseek,
-       .read =         usbdev_read,
-       .poll =         usbdev_poll,
-       .ioctl =        usbdev_ioctl,
-       .open =         usbdev_open,
-       .release =      usbdev_release,
+       .owner =          THIS_MODULE,
+       .llseek =         usbdev_lseek,
+       .read =           usbdev_read,
+       .poll =           usbdev_poll,
+       .unlocked_ioctl = usbdev_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl =   usbdev_compat_ioctl,
+#endif
+       .open =           usbdev_open,
+       .release =        usbdev_release,
 };
 
 static void usbdev_remove(struct usb_device *udev)