From patchwork Tue Jan 14 10:02:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233939 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B740C33CB3 for ; Tue, 14 Jan 2020 10:13:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 652E320678 for ; Tue, 14 Jan 2020 10:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996785; bh=NyxBHmM4o4wJ3SNfohOpP+c4dFvw3hcpd009Red+JrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h2prSLDgGw4DRJa20CvjWFISRJc05LPhDz3ap7+gIfTk/T5T4JnhNau4mSfE3gaIl UaUmFaZDGdRL5eJfCHzmNkE+CeQi/RGi59N68YM9HmWnlcl0MAAkh06IKMhgolmksi jSTeZkQQD1U2RqeVpVr/Tmmw1vY+rnq/pt4MVyqU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730322AbgANKNE (ORCPT ); Tue, 14 Jan 2020 05:13:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:50020 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729728AbgANKND (ORCPT ); Tue, 14 Jan 2020 05:13:03 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 266E024676; Tue, 14 Jan 2020 10:13:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578996782; bh=NyxBHmM4o4wJ3SNfohOpP+c4dFvw3hcpd009Red+JrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RJGElFEY5vrQbOHEdj34pSAnlyMfB2W5DiJ7MGc7gd6nlIRNpySrAmQTEKsxzx2XH DP8ip9j0IVyZ19LWnyYsGDuXbkAO/EwiGbRUNfQupURgOkpQRoJo8Um+Ad8tijh+tm 8fvGMJnAlEiWHp3ZiPQhu+j8ryXgH82cVQL6sjJo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , Ganapathi Bhat , Kalle Valo , Ben Hutchings Subject: [PATCH 4.4 23/28] mwifiex: pcie: Fix memory leak in mwifiex_pcie_alloc_cmdrsp_buf Date: Tue, 14 Jan 2020 11:02:25 +0100 Message-Id: <20200114094344.171579223@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114094336.845958665@linuxfoundation.org> References: <20200114094336.845958665@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Navid Emamdoost commit db8fd2cde93227e566a412cf53173ffa227998bc upstream. In mwifiex_pcie_alloc_cmdrsp_buf, a new skb is allocated which should be released if mwifiex_map_pci_memory() fails. The release is added. Fixes: fc3314609047 ("mwifiex: use pci_alloc/free_consistent APIs for PCIe") Signed-off-by: Navid Emamdoost Acked-by: Ganapathi Bhat Signed-off-by: Kalle Valo Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/mwifiex/pcie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c @@ -921,8 +921,10 @@ static int mwifiex_pcie_alloc_cmdrsp_buf } skb_put(skb, MWIFIEX_UPLD_SIZE); if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE, - PCI_DMA_FROMDEVICE)) + PCI_DMA_FROMDEVICE)) { + kfree_skb(skb); return -1; + } card->cmdrsp_buf = skb;