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=-12.8 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,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 7838BC61DD8 for ; Tue, 27 Oct 2020 17:20:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B44C22384 for ; Tue, 27 Oct 2020 17:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819247; bh=7WraC83vZtyV3v1YKsMF4+NWyB+Vdlg0yhD/SehfC5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mcsFtDQNA4tL0aOnt+5XeVliPhSLEpdIregNn5hdVT4MQJ3MVz6LhX1FUnAW3TSas NTHiJk0deLIhaVPN8MWxLa8DeicTNPpWPSJSTZJdclhEg/ShQYFp+VfSbiTf+RBMl/ bwpIuaCYysr+oG1ja3Ol8kQ3RjtPbdy+zzjrwPKc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1818174AbgJ0RRz (ORCPT ); Tue, 27 Oct 2020 13:17:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:58244 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752688AbgJ0O5V (ORCPT ); Tue, 27 Oct 2020 10:57:21 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 6FCB722264; Tue, 27 Oct 2020 14:57:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810640; bh=7WraC83vZtyV3v1YKsMF4+NWyB+Vdlg0yhD/SehfC5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dimc2iUURC7Ztw3qPNKosnCvQUXmAshlNztIjyb2l882Q/3OPAe3JoS8UzT+tzxcp t++7jWCnhFhpHTCIVLHFHPTw4TsMEJTwJzKLx5g3at7oj0JcavTyCEXzA9opR0Vq2N AC89mlm9l8wiUN/GJxMEpaqxRmXCdSvrYqqNUqgA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Ajay Singh , Kalle Valo , Sasha Levin Subject: [PATCH 5.8 180/633] wilc1000: Fix memleak in wilc_sdio_probe Date: Tue, 27 Oct 2020 14:48:43 +0100 Message-Id: <20201027135531.132473554@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dinghao Liu [ Upstream commit 8d95ab34b21ee0f870a9185b6457e8f6eb54914c ] When devm_clk_get() returns -EPROBE_DEFER, sdio_priv should be freed just like when wilc_cfg80211_init() fails. Fixes: 8692b047e86cf ("staging: wilc1000: look for rtc_clk clock") Signed-off-by: Dinghao Liu Acked-by: Ajay Singh Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20200820054819.23365-1-dinghao.liu@zju.edu.cn Signed-off-by: Sasha Levin --- drivers/staging/wilc1000/sdio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wilc1000/sdio.c b/drivers/staging/wilc1000/sdio.c index 36eb589263bfd..b14e4ed6134fc 100644 --- a/drivers/staging/wilc1000/sdio.c +++ b/drivers/staging/wilc1000/sdio.c @@ -151,9 +151,10 @@ static int wilc_sdio_probe(struct sdio_func *func, wilc->dev = &func->dev; wilc->rtc_clk = devm_clk_get(&func->card->dev, "rtc"); - if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER) + if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER) { + kfree(sdio_priv); return -EPROBE_DEFER; - else if (!IS_ERR(wilc->rtc_clk)) + } else if (!IS_ERR(wilc->rtc_clk)) clk_prepare_enable(wilc->rtc_clk); dev_info(&func->dev, "Driver Initializing success\n"); -- 2.25.1