From patchwork Thu Jul 28 16:03:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shajakhan, Mohammed" X-Patchwork-Id: 1016752 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6SG3IPS011907 for ; Thu, 28 Jul 2011 16:03:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754688Ab1G1QDQ (ORCPT ); Thu, 28 Jul 2011 12:03:16 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:8626 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754502Ab1G1QDQ (ORCPT ); Thu, 28 Jul 2011 12:03:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=mohammed@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1311868996; x=1343404996; h=from:to:cc:subject:date:message-id:mime-version; z=From:=20Mohammed=20Shafi=20Shajakhan=20|To:=20|CC:=20,=20, =0D=0A=09,=20Mohammed=20Shafi =20Shajakhan=0D=0A=09|Subject: =20[RFC]=20ath9k_htc:=20Fix=20memory=20leaks|Date:=20Thu, =2028=20Jul=202011=2021:33:07=20+0530|Message-ID:=20<1311 868987-19398-1-git-send-email-mohammed@qca.qualcomm.com> |MIME-Version:=201.0; bh=ZIto5TYHDtai99c5U/7oe1DMT1ga4VEDSt4YgdfxBgI=; b=JwNSpsXmoYIJmXTc4AUJJgFnKP4+LHJ9awL1GC5G7fsxiTsUsmdkFzo6 TypnbEx0dioVftpAe5VhB2oZR/CpZVLTOjrtk+ALTH/psDhDAo5nfNdpM lchRwtkpiVQE65fs2UgdCku9oBJ9te4VMlhHsxCEXttd8vxQRBz13qF84 k=; X-IronPort-AV: E=McAfee;i="5400,1158,6420"; a="106544185" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine01.qualcomm.com with ESMTP; 28 Jul 2011 09:03:15 -0700 X-IronPort-AV: E=Sophos;i="4.67,282,1309762800"; d="scan'208";a="54489881" Received: from nasanexhub04.qualcomm.com (HELO nasanexhub04.na.qualcomm.com) ([129.46.134.222]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-MD5; 28 Jul 2011 09:03:15 -0700 Received: from NASJOEXHC01.na.qualcomm.com (10.234.56.15) by nasanexhub04.na.qualcomm.com (129.46.134.222) with Microsoft SMTP Server (TLS) id 8.3.83.0; Thu, 28 Jul 2011 09:03:15 -0700 Received: from qcamail1.atheros.com (10.12.4.23) by qcamail1.atheros.com (10.234.56.15) with Microsoft SMTP Server (TLS) id 14.1.323.0; Thu, 28 Jul 2011 09:03:07 -0700 Received: by qcamail1.atheros.com (sSMTP sendmail emulation); Thu, 28 Jul 2011 21:33:09 +0530 From: Mohammed Shafi Shajakhan To: CC: , , , Mohammed Shafi Shajakhan Subject: [RFC] ath9k_htc: Fix memory leaks Date: Thu, 28 Jul 2011 21:33:07 +0530 Message-ID: <1311868987-19398-1-git-send-email-mohammed@qca.qualcomm.com> X-Mailer: git-send-email 1.7.0.4 MIME-Version: 1.0 X-Originating-IP: [10.12.4.23] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 28 Jul 2011 16:03:18 +0000 (UTC) From: Mohammed Shafi Shajakhan need to do more review and rigorous testing. Raj pointed out that there are several places we are not freeing skb's when there is timeout Signed-off-by: Mohammed Shafi Shajakhan --- drivers/net/wireless/ath/ath9k/htc_hst.c | 13 ++++++++----- drivers/net/wireless/ath/ath9k/wmi.c | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c index 1b90ed8..e435c9b 100644 --- a/drivers/net/wireless/ath/ath9k/htc_hst.c +++ b/drivers/net/wireless/ath/ath9k/htc_hst.c @@ -169,13 +169,14 @@ static int htc_config_pipe_credits(struct htc_target *target) time_left = wait_for_completion_timeout(&target->cmd_wait, HZ); if (!time_left) { dev_err(target->dev, "HTC credit config timeout\n"); - return -ETIMEDOUT; + ret = -ETIMEDOUT; + goto err; } return 0; err: kfree_skb(skb); - return -EINVAL; + return ret; } static int htc_setup_complete(struct htc_target *target) @@ -204,14 +205,15 @@ static int htc_setup_complete(struct htc_target *target) time_left = wait_for_completion_timeout(&target->cmd_wait, HZ); if (!time_left) { dev_err(target->dev, "HTC start timeout\n"); - return -ETIMEDOUT; + ret = -ETIMEDOUT; + goto err; } return 0; err: kfree_skb(skb); - return -EINVAL; + return ret; } /* HTC APIs */ @@ -276,7 +278,8 @@ int htc_connect_service(struct htc_target *target, 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; diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c index 35422fc..50d901d 100644 --- a/drivers/net/wireless/ath/ath9k/wmi.c +++ b/drivers/net/wireless/ath/ath9k/wmi.c @@ -334,7 +334,8 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id, "Timeout waiting for WMI command: %s\n", wmi_cmd_to_name(cmd_id)); mutex_unlock(&wmi->op_mutex); - return -ETIMEDOUT; + ret = -ETIMEDOUT; + goto out; } mutex_unlock(&wmi->op_mutex);