From patchwork Mon Nov 11 21:15:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miles Hu X-Patchwork-Id: 11237789 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 527751709 for ; Mon, 11 Nov 2019 21:16:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2DE7220818 for ; Mon, 11 Nov 2019 21:16:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ufdutHNU"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="aKuYFw54"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="eJyMrNxR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2DE7220818 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=2Yfh2tXKYNpY9jgsnTMRJJOAb+DSB/rlM4/gZWCCVG8=; b=ufd utHNUMUcO7GjLV79gYwMcmSBDjTxtQYa34WMoW/Tu89EGOwFDumk4L21c8bTKM07qmrnEctbnhfqC Tq8O4bxm4+yH1AQ9QOj91ZxyNYFxanaTqV9oppa8BjxKEAehM/dUObxBGFewFCR71ThLa+wZ1XUPD WVLupBjvk8siR45ggFgkoF0v4QOPZLwFm5jaqew50Kz3s0yfIYJ477HD7TjYcQ/qHfMFiuNWwERbu 5mft8IfT7LVSIJzGaatf1T0UxYnlOhbsmykA8lvv/bgP6AOpO3/dqOm8jsaAl/nBIhYuE/h9yymFR 4u0eJgAdIYeNLHyVtzHy6eQREdgQ3QQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUH2q-0003Jo-UI; Mon, 11 Nov 2019 21:16:20 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iUH2p-0003JT-5s for ath11k@lists.infradead.org; Mon, 11 Nov 2019 21:16:20 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0B48B60DAB; Mon, 11 Nov 2019 21:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1573506916; bh=kzRrzkvIv6ZxmPptUnnkNua8cEEAIIZMhbr1bJvVDig=; h=From:To:Cc:Subject:Date:From; b=aKuYFw54KD8TuojI4liKpB5f/vBUXgBV72VxHgra3h/EPxjvL+Z7xWtRKQj16iw1I 9h7sPSQaZGt6ADtelPl5Qu6URAUT2nBH1FPTBEMROEj+FaZgmguSMDpFfDC06gpG0z Z7wtrtpbHwV0qVyADP0mDnXtKrNd2Gly49j7Yh34= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from smtp.codeaurora.org (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: milehu@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8534C60DF7; Mon, 11 Nov 2019 21:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1573506915; bh=kzRrzkvIv6ZxmPptUnnkNua8cEEAIIZMhbr1bJvVDig=; h=From:To:Cc:Subject:Date:From; b=eJyMrNxRKE+iavO9jDorwlXjvFlzVBBkU9geUzlIhAnCNDX1lRLBcuzblAEra/zFI l/GoRBIxELQ2c4Nd6ulKT0VU5Hnk140oYaUCUd80nDDpoVhIzK7oOkEJtCbV0umC56 zNO957ly6H3qYKHl8r14jGJYZUC/G32CGlXP7vIg= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8534C60DF7 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=milehu@codeaurora.org Received: by smtp.codeaurora.org (sSMTP sendmail emulation); Mon, 11 Nov 2019 13:15:13 -0800 From: Miles Hu To: ath11k@lists.infradead.org Subject: [PATCH] ath11k: fix memory leak in monitor mode Date: Mon, 11 Nov 2019 13:15:03 -0800 Message-Id: <1573506903-3593-1-git-send-email-milehu@codeaurora.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191111_131619_242884_65BDEAF5 X-CRM114-Status: GOOD ( 10.52 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.145.29.96 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Miles Hu MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org remove tail check to avoid last amsdu leak. recycle skb in ppdu id wrap around case Signed-off-by: Miles Hu --- drivers/net/wireless/ath/ath11k/dp_rx.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -3991,8 +3991,15 @@ ath11k_dp_rx_mon_mpdu_pop(struct ath11k if (ath11k_dp_rx_mon_comp_ppduid(msdu_ppdu_id, ppdu_id, - &rx_bufs_used)) + &rx_bufs_used)) { + if (rx_bufs_used) { + drop_mpdu = true; + dev_kfree_skb_any(msdu); + msdu = NULL; + goto next_msdu; + } return rx_bufs_used; + } pmon->mon_last_linkdesc_paddr = paddr; is_first_msdu = false; } @@ -4194,7 +4201,7 @@ static int ath11k_dp_rx_mon_deliver(stru ath11k_dp_rx_deliver_msdu(ar, napi, mon_skb); mon_skb = skb_next; - } while (mon_skb && (mon_skb != tail_msdu)); + } while (mon_skb); rxs->flag = 0; return 0;