From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20120528031208.131536455@decadent.org.uk> Date: Mon, 28 May 2012 04:12:40 +0100 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Oliver Neukum , Oliver Neukum , Greg Kroah-Hartman Subject: [ 038/117] USB: cdc-wdm: fix memory leak In-Reply-To: <20120528031202.829379252@decadent.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver Neukum 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 Signed-off-by: Greg Kroah-Hartman [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings --- drivers/usb/class/cdc-wdm.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -590,6 +590,8 @@ kill_urbs(desc); if (!test_bit(WDM_DISCONNECTING, &desc->flags)) desc->intf->needs_remote_wakeup = 0; + else + cleanup(desc); } mutex_unlock(&wdm_mutex); return 0;