diff options
| author | Oliver Neukum <oliver@neukum.org> | 2012-04-27 14:36:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-01 15:18:18 +0800 |
| commit | fccfda602805358246118c8ed991a0cb32160d0f (patch) | |
| tree | ae7c1e84228d39bca80e75b3a49a7077083bb568 | |
| parent | eae68611b2683cc1a9a7ca669c60a65020071004 (diff) | |
| download | lwn-fccfda602805358246118c8ed991a0cb32160d0f.tar.gz lwn-fccfda602805358246118c8ed991a0cb32160d0f.zip | |
USB: cdc-wdm: fix memory leak
commit 2f338c8a1904e2e7aa5a8bd12fb0cf2422d17da4 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 0209b467aa75..6bf1a4042236 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -625,6 +625,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; |