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.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 C6276C433FB for ; Mon, 27 Jul 2020 14:14:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3D7A2083E for ; Mon, 27 Jul 2020 14:14:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859279; bh=XQDfGytVTpKeb+agTuSXemU8hW+k5+3VzA9zL6czwig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sWLd8AniYEyKv29wb2FtUnvuCn8TVAFtjUcUo7CIwZfRlkqSkN6Q7FxMLdQhzu/ie dx4kkPEMjW6kQ1wIu9v9VJkz3ytjaX+gWEcOXgZj5VllKJtaRbM6um9EdGRZ/gSWA9 ElBgWDt7YbAMI4be0RavvRftFsw5aXIXhi+f/vS8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730567AbgG0OOi (ORCPT ); Mon, 27 Jul 2020 10:14:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:40318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730562AbgG0OOg (ORCPT ); Mon, 27 Jul 2020 10:14:36 -0400 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 F1AD721883; Mon, 27 Jul 2020 14:14:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859276; bh=XQDfGytVTpKeb+agTuSXemU8hW+k5+3VzA9zL6czwig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RvCn3OZPhDRhIazH7veEXW/5xE1iRMyO3hReXW5VNbmHUbkk6YzaSGZeEooIwMRQk Oa8j1SoXca39bVAhq/66s3M/2u/4QpprAinOp460xpf5qRXwzyOn8WUpVW1oSS8LSs 99KpGhLgXMe9GVAITBPsCw5eaqqt4bSNUVZqIPno= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Jian , Michael Hennerich , Stefan Schmidt , Sasha Levin Subject: [PATCH 5.4 046/138] ieee802154: fix one possible memleak in adf7242_probe Date: Mon, 27 Jul 2020 16:04:01 +0200 Message-Id: <20200727134927.663862553@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134925.228313570@linuxfoundation.org> References: <20200727134925.228313570@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Liu Jian [ Upstream commit 66673f96f0f968b991dc38be06102246919c663c ] When probe fail, we should destroy the workqueue. Fixes: 2795e8c25161 ("net: ieee802154: fix a potential NULL pointer dereference") Signed-off-by: Liu Jian Acked-by: Michael Hennerich Link: https://lore.kernel.org/r/20200717090121.2143-1-liujian56@huawei.com Signed-off-by: Stefan Schmidt Signed-off-by: Sasha Levin --- drivers/net/ieee802154/adf7242.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c index 5a37514e42347..8dbccec6ac866 100644 --- a/drivers/net/ieee802154/adf7242.c +++ b/drivers/net/ieee802154/adf7242.c @@ -1262,7 +1262,7 @@ static int adf7242_probe(struct spi_device *spi) WQ_MEM_RECLAIM); if (unlikely(!lp->wqueue)) { ret = -ENOMEM; - goto err_hw_init; + goto err_alloc_wq; } ret = adf7242_hw_init(lp); @@ -1294,6 +1294,8 @@ static int adf7242_probe(struct spi_device *spi) return ret; err_hw_init: + destroy_workqueue(lp->wqueue); +err_alloc_wq: mutex_destroy(&lp->bmux); ieee802154_free_hw(lp->hw); -- 2.25.1