From mboxrd@z Thu Jan 1 00:00:00 1970 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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 19D72C433DF for ; Sun, 18 Oct 2020 19:37:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C89E0206CA for ; Sun, 18 Oct 2020 19:37:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049849; bh=0gt/BdUnjet6wwgBcbHhkuBhangU35v/BOtsUmknBv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cU4kj9PEIdkAjviNNB7fN+9k+jBOHfXJ2lHIl6ba0/+tqfvKGAwARaD/YDZfgzgzC Mw+jLTWjkK6ZxqPi4IDmX9G6nyvP+zPivz2QS9XLHeM7Cd+mRzbAzxlSK2naxEq7SL 704TlXGTez+NPRIklya5sB8qi4Y+lDvYCX7EeYU0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732808AbgJRTh3 (ORCPT ); Sun, 18 Oct 2020 15:37:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:39868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731247AbgJRTZX (ORCPT ); Sun, 18 Oct 2020 15:25:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12EC1222C8; Sun, 18 Oct 2020 19:25:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049123; bh=0gt/BdUnjet6wwgBcbHhkuBhangU35v/BOtsUmknBv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wb4iRfOiQrXVvmWvA21cu+D3WORk4BdjEbGZX/ipJSF7PaShDqI7uWWKNsHP6lbQN WLvbz2MrsXZMpb/T/omVCffTziUUPRMbiw+v+xF8B26J2p98FCYm5nFjRxSC7w6pyI zr7hJ4AQbdPN8KL64PjFFYLGbBTYtm2doPCAUgZk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wang Yufen , Hulk Robot , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 53/56] brcm80211: fix possible memleak in brcmf_proto_msgbuf_attach Date: Sun, 18 Oct 2020 15:24:14 -0400 Message-Id: <20201018192417.4055228-53-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018192417.4055228-1-sashal@kernel.org> References: <20201018192417.4055228-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wang Yufen [ Upstream commit 6c151410d5b57e6bb0d91a735ac511459539a7bf ] When brcmf_proto_msgbuf_attach fail and msgbuf->txflow_wq != NULL, we should destroy the workqueue. Reported-by: Hulk Robot Signed-off-by: Wang Yufen Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/1595237765-66238-1-git-send-email-wangyufen@huawei.com Signed-off-by: Sasha Levin --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c index ee922b0525610..768a99c15c08b 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c @@ -1563,6 +1563,8 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr) BRCMF_TX_IOCTL_MAX_MSG_SIZE, msgbuf->ioctbuf, msgbuf->ioctbuf_handle); + if (msgbuf->txflow_wq) + destroy_workqueue(msgbuf->txflow_wq); kfree(msgbuf); } return -ENOMEM; -- 2.25.1