USB: cdc-wdm: fix memory leak

Oliver Neukum · gregkh · commit 2f338c8a1904 · 2012-04-29T21:53:41.000-04:00
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 &lt;oneukum@suse.de&gt;
Cc: stable &lt;stable@vger.kernel.org&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -622,6 +622,8 @@ static int wdm_release(struct inode inode, struct file file)`
`622`	`622`	`kill_urbs(desc);`
`623`	`623`	`if (!test_bit(WDM_DISCONNECTING, &desc->flags))`
`624`	`624`	`desc->manage_power(desc->intf, 0);`
	`625`	`+ else`
	`626`	`+ cleanup(desc);`
`625`	`627`	`}`
`626`	`628`	`mutex_unlock(&wdm_mutex);`
`627`	`629`	`return 0;`