diff options
author | Oliver Neukum <oliver@neukum.org> | 2012-04-27 14:36:37 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-30 03:53:41 +0200 |
commit | 2f338c8a1904e2e7aa5a8bd12fb0cf2422d17da4 (patch) | |
tree | 0d0e6ded4a8e9334187b84ccc311ccb250cc9f33 /drivers/usb/class | |
parent | USB: cdc-wdm: sanitize error returns (diff) | |
download | linux-2f338c8a1904e2e7aa5a8bd12fb0cf2422d17da4.tar.xz linux-2f338c8a1904e2e7aa5a8bd12fb0cf2422d17da4.zip |
USB: cdc-wdm: fix memory leak
cleanup() is not called if the last close() comes after
disconnect(). That leads to a memory leak. Rectified
by checking for an earlier disconnect() in release()
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
-rw-r--r-- | drivers/usb/class/cdc-wdm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index b29a9815e4d2..650e1da4d2bf 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -622,6 +622,8 @@ static int wdm_release(struct inode *inode, struct file *file) kill_urbs(desc); if (!test_bit(WDM_DISCONNECTING, &desc->flags)) desc->manage_power(desc->intf, 0); + else + cleanup(desc); } mutex_unlock(&wdm_mutex); return 0; |