Return-path: <linux-wireless-owner@vger.kernel.org>
Received: from hrndva-omtalb.mail.rr.com ([71.74.56.125]:45231 "EHLO
	hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751721Ab1HNBeb (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Sat, 13 Aug 2011 21:34:31 -0400
Date: Sat, 13 Aug 2011 20:34:27 -0500
From: Larry Finger <Larry.Finger@lwfinger.net>
To: John W Linville <linville@tuxdriver.com>
Cc: lrodriguez@atheros.com, lrodriguez@atheros.com,
	vasanth@atheros.com, senthilkumar@atheros.com,
	ath9k-devel@lists.ath9k.org, linux-wireless@vger.kernel.org
Subject: [RFC/RFT] ath9k_htc: Fix memory leak
Message-ID: <4e472623.xXZaXUueNVRpfmG+%Larry.Finger@lwfinger.net> (sfid-20110814_033440_455992_CA5EDE81)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: linux-wireless-owner@vger.kernel.org
List-ID: <linux-wireless.vger.kernel.org>

Kmemleak shows the following kind of memory leak for ath9k_htc:

unreferenced object 0xffff88004542f200 (size 512):
  comm "khubd", pid 977, jiffies 4317632516 (age 16855.868s)
  hex dump (first 32 bytes):
    00 00 00 0a 00 00 00 00 00 02 01 05 00 00 02 01  ................
    00 00 00 00 00 00 81 38 02 00 00 00 33 33 30 30  .......8....3300
  backtrace:
    [<ffffffff81122d77>] create_object+0x127/0x2b0
    [<ffffffff813580b1>] kmemleak_alloc+0x21/0x50
    [<ffffffff8111f383>] __kmalloc_node_track_caller+0x153/0x220
    [<ffffffff812b703e>] __alloc_skb+0x7e/0x170
    [<ffffffffa0833331>] htc_connect_service+0x111/0x200 [ath9k_htc]
    [<ffffffffa083bb90>] ath9k_init_htc_services+0x240/0x2b0 [ath9k_htc]
    [<ffffffffa083c1ca>] ath9k_htc_probe_device+0xea/0xa50 [ath9k_htc]
    [<ffffffffa08338dc>] ath9k_htc_hw_init+0xc/0x30 [ath9k_htc]
    [<ffffffffa08356ba>] ath9k_hif_usb_probe+0x1ca/0x420 [ath9k_htc]
    [<ffffffffa00a2279>] usb_probe_interface+0xb9/0x160 [usbcore]
    [<ffffffff81279379>] driver_probe_device+0x89/0x1a0
    [<ffffffff8127958b>] __device_attach+0x4b/0x60
    [<ffffffff81278024>] bus_for_each_drv+0x64/0x90
    [<ffffffff81279231>] device_attach+0xa1/0xb0
    [<ffffffff81278a25>] bus_probe_device+0x25/0x40
    [<ffffffff81276d2a>] device_add+0x55a/0x630

The device is a TP-Link TL-WN722N. The output from lsusb is "ID 0cf3:9271
Atheros Communications, Inc. AR9271 802.11n".

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org>
---

This patch certainly fixes a leak. I'm testing to see if there are
others.

How far back should the patch go for stable kernels?

Larry
---

Index: wireless-testing-new/drivers/net/wireless/ath/ath9k/htc_hst.c
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ wireless-testing-new/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -276,7 +276,8 @@ int htc_connect_service(struct htc_targe
 	if (!time_left) {
 		dev_err(target->dev, "Service connection timeout for: %d\n",
 			service_connreq->service_id);
-		return -ETIMEDOUT;
+		ret = -ETIMEDOUT;
+		goto err;
 	}
 
 	*conn_rsp_epid = target->conn_rsp_epid;