gadgetfs: use-after-free in ->aio_read()

[pandora-kernel.git] / drivers / usb / gadget / inode.c

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index a392ec0..d00b3e3 100644 (file)
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -570,6 +570,7 @@ static ssize_t ep_aio_read_retry(struct kiocb *iocb)
                        break;
        }
        kfree(priv->buf);
+       kfree(priv->iv);
        kfree(priv);
        return len;
 }
@@ -591,6 +592,7 @@ static void ep_aio_complete(struct usb_ep *ep, struct usb_request *req)
         */
        if (priv->iv == NULL || unlikely(req->actual == 0)) {
                kfree(req->buf);
+               kfree(priv->iv);
                kfree(priv);
                iocb->private = NULL;
                /* aio_complete() reports bytes-transferred _and_ faults */
@@ -626,7 +628,7 @@ ep_aio_rwtail(
        struct usb_request      *req;
        ssize_t                 value;
 
-       priv = kmalloc(sizeof *priv, GFP_KERNEL);
+       priv = kzalloc(sizeof *priv, GFP_KERNEL);
        if (!priv) {
                value = -ENOMEM;
 fail:
@@ -634,7 +636,14 @@ fail:
                return value;
        }
        iocb->private = priv;
-       priv->iv = iv;
+       if (iv) {
+               priv->iv = kmemdup(iv, nr_segs * sizeof(struct iovec),
+                                  GFP_KERNEL);
+               if (!priv->iv) {
+                       kfree(priv);
+                       goto fail;
+               }
+       }
        priv->nr_segs = nr_segs;
 
        value = get_ready_ep(iocb->ki_filp->f_flags, epdata);
@@ -672,6 +681,7 @@ fail:
        mutex_unlock(&epdata->lock);
 
        if (unlikely(value)) {
+               kfree(priv->iv);
                kfree(priv);
                put_ep(epdata);
        } else
@@ -1043,6 +1053,8 @@ ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr)
 // FIXME don't call this with the spinlock held ...
                                if (copy_to_user (buf, dev->req->buf, len))
                                        retval = -EFAULT;
+                               else
+                                       retval = len;
                                clean_req (dev->gadget->ep0, dev->req);
                                /* NOTE userspace can't yet choose to stall */
                        }
@@ -1730,8 +1742,9 @@ static void
 gadgetfs_disconnect (struct usb_gadget *gadget)
 {
        struct dev_data         *dev = get_gadget_data (gadget);
+       unsigned long           flags;
 
-       spin_lock (&dev->lock);
+       spin_lock_irqsave (&dev->lock, flags);
        if (dev->state == STATE_DEV_UNCONNECTED)
                goto exit;
        dev->state = STATE_DEV_UNCONNECTED;
@@ -1740,7 +1753,7 @@ gadgetfs_disconnect (struct usb_gadget *gadget)
        next_event (dev, GADGETFS_DISCONNECT);
        ep0_readable (dev);
 exit:
-       spin_unlock (&dev->lock);
+       spin_unlock_irqrestore (&dev->lock, flags);
 }
 
 static void