[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <d8fde586-1230-9900-acd8-e012c4e9dee0@microchip.com>
Date: Thu, 20 Aug 2020 05:58:18 +0000
From: <Ajay.Kathat@...rochip.com>
To: <dinghao.liu@....edu.cn>, <kjlu@....edu>
CC: <Claudiu.Beznea@...rochip.com>, <kvalo@...eaurora.org>,
<davem@...emloft.net>, <kuba@...nel.org>,
<gregkh@...uxfoundation.org>, <adham.abozaeid@...rochip.com>,
<linux-wireless@...r.kernel.org>, <netdev@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] [v2] wilc1000: Fix memleak in wilc_bus_probe
On 20/08/20 11:22 am, Dinghao Liu wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> When devm_clk_get() returns -EPROBE_DEFER, spi_priv
> should be freed just like when wilc_cfg80211_init()
> fails.
>
> Fixes: 854d66df74aed ("staging: wilc1000: look for rtc_clk clock in spi mode")
> Signed-off-by: Dinghao Liu <dinghao.liu@....edu.cn>
Acked-by: Ajay Singh <ajay.kathat@...rochip.com>
> ---
>
> Changelog:
>
> v2: - Remove 'staging' prefix in subject.
> ---
> drivers/net/wireless/microchip/wilc1000/spi.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/microchip/wilc1000/spi.c b/drivers/net/wireless/microchip/wilc1000/spi.c
> index 3f19e3f38a39..a18dac0aa6b6 100644
> --- a/drivers/net/wireless/microchip/wilc1000/spi.c
> +++ b/drivers/net/wireless/microchip/wilc1000/spi.c
> @@ -112,9 +112,10 @@ static int wilc_bus_probe(struct spi_device *spi)
> wilc->dev_irq_num = spi->irq;
>
> wilc->rtc_clk = devm_clk_get(&spi->dev, "rtc_clk");
> - if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER)
> + if (PTR_ERR_OR_ZERO(wilc->rtc_clk) == -EPROBE_DEFER) {
> + kfree(spi_priv);
> return -EPROBE_DEFER;
> - else if (!IS_ERR(wilc->rtc_clk))
> + } else if (!IS_ERR(wilc->rtc_clk))
> clk_prepare_enable(wilc->rtc_clk);
>
> return 0;
> --
> 2.17.1
>
Powered by blists - more mailing lists