USB: rio500: fix memory leak in close after disconnect

If a disconnected device is closed, rio_close() must free
the buffers.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 15 insertions, 2 deletions

diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index 1d397d93d127..a32d61a79ab8 100644
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -86,9 +86,22 @@ static int close_rio(struct inode *inode, struct file *file)
 {
         struct rio_usb_data *rio = &rio_instance;
 
-        rio->isopen = 0;
+        /* against disconnect() */
+        mutex_lock(&rio500_mutex);
+        mutex_lock(&(rio->lock));
 
-        dev_info(&rio->rio_dev->dev, "Rio closed.\n");
+        rio->isopen = 0;
+        if (!rio->present) {
+                /* cleanup has been delayed */
+                kfree(rio->ibuf);
+                kfree(rio->obuf);
+                rio->ibuf = NULL;
+                rio->obuf = NULL;
+        } else {
+                dev_info(&rio->rio_dev->dev, "Rio closed.\n");
+        }
+        mutex_unlock(&(rio->lock));
+        mutex_unlock(&rio500_mutex);
         return 0;
 }