Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / drivers / usb / gadget / function / f_fs.c

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 2f3fa4d..54ad100 100644 (file)
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -98,6 +98,9 @@ static int ffs_func_set_alt(struct usb_function *, unsigned, unsigned);
 static void ffs_func_disable(struct usb_function *);
 static int ffs_func_setup(struct usb_function *,
                          const struct usb_ctrlrequest *);
+static bool ffs_func_req_match(struct usb_function *,
+                              const struct usb_ctrlrequest *,
+                              bool config0);
 static void ffs_func_suspend(struct usb_function *);
 static void ffs_func_resume(struct usb_function *);
 
@@ -2243,7 +2246,9 @@ static int __ffs_data_got_descs(struct ffs_data *ffs,
                              FUNCTIONFS_HAS_SS_DESC |
                              FUNCTIONFS_HAS_MS_OS_DESC |
                              FUNCTIONFS_VIRTUAL_ADDR |
-                             FUNCTIONFS_EVENTFD)) {
+                             FUNCTIONFS_EVENTFD |
+                             FUNCTIONFS_ALL_CTRL_RECIP |
+                             FUNCTIONFS_CONFIG0_SETUP)) {
                        ret = -ENOSYS;
                        goto error;
                }
@@ -3094,8 +3099,9 @@ static int ffs_func_setup(struct usb_function *f,
         * handle them.  All other either handled by composite or
         * passed to usb_configuration->setup() (if one is set).  No
         * matter, we will handle requests directed to endpoint here
-        * as well (as it's straightforward) but what to do with any
-        * other request?
+        * as well (as it's straightforward).  Other request recipient
+        * types are only handled when the user flag FUNCTIONFS_ALL_CTRL_RECIP
+        * is being used.
         */
        if (ffs->state != FFS_ACTIVE)
                return -ENODEV;
@@ -3116,7 +3122,10 @@ static int ffs_func_setup(struct usb_function *f,
                break;
 
        default:
-               return -EOPNOTSUPP;
+               if (func->ffs->user_flags & FUNCTIONFS_ALL_CTRL_RECIP)
+                       ret = le16_to_cpu(creq->wIndex);
+               else
+                       return -EOPNOTSUPP;
        }
 
        spin_lock_irqsave(&ffs->ev.waitq.lock, flags);
@@ -3128,6 +3137,28 @@ static int ffs_func_setup(struct usb_function *f,
        return 0;
 }
 
+static bool ffs_func_req_match(struct usb_function *f,
+                              const struct usb_ctrlrequest *creq,
+                              bool config0)
+{
+       struct ffs_function *func = ffs_func_from_usb(f);
+
+       if (config0 && !(func->ffs->user_flags & FUNCTIONFS_CONFIG0_SETUP))
+               return false;
+
+       switch (creq->bRequestType & USB_RECIP_MASK) {
+       case USB_RECIP_INTERFACE:
+               return ffs_func_revmap_intf(func,
+                                           le16_to_cpu(creq->wIndex) >= 0);
+       case USB_RECIP_ENDPOINT:
+               return ffs_func_revmap_ep(func,
+                                         le16_to_cpu(creq->wIndex) >= 0);
+       default:
+               return (bool) (func->ffs->user_flags &
+                              FUNCTIONFS_ALL_CTRL_RECIP);
+       }
+}
+
 static void ffs_func_suspend(struct usb_function *f)
 {
        ENTER();
@@ -3378,6 +3409,7 @@ static struct usb_function *ffs_alloc(struct usb_function_instance *fi)
        func->function.set_alt = ffs_func_set_alt;
        func->function.disable = ffs_func_disable;
        func->function.setup   = ffs_func_setup;
+       func->function.req_match = ffs_func_req_match;
        func->function.suspend = ffs_func_suspend;
        func->function.resume  = ffs_func_resume;
        func->function.free_func = ffs_free;
@@ -3470,6 +3502,11 @@ static void _ffs_free_dev(struct ffs_dev *dev)
        list_del(&dev->entry);
        if (dev->name_allocated)
                kfree(dev->name);
+
+       /* Clear the private_data pointer to stop incorrect dev access */
+       if (dev->ffs_data)
+               dev->ffs_data->private_data = NULL;
+
        kfree(dev);
        if (list_empty(&ffs_devices))
                functionfs_cleanup();