* [PATCH] [v2] wilc1000: Fix memleak in wilc_bus_probe
@ 2020-08-20 5:52 Dinghao Liu
2020-08-20 5:58 ` Ajay.Kathat
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Dinghao Liu @ 2020-08-20 5:52 UTC (permalink / raw)
To: dinghao.liu, kjlu
Cc: Ajay Singh, Claudiu Beznea, Kalle Valo, David S. Miller,
Jakub Kicinski, Greg Kroah-Hartman, Adham Abozaeid,
linux-wireless, netdev, linux-kernel
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@zju.edu.cn>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] [v2] wilc1000: Fix memleak in wilc_bus_probe
2020-08-20 5:52 [PATCH] [v2] wilc1000: Fix memleak in wilc_bus_probe Dinghao Liu
@ 2020-08-20 5:58 ` Ajay.Kathat
2020-08-25 8:12 ` Claudiu.Beznea
2020-08-27 10:03 ` Kalle Valo
2 siblings, 0 replies; 4+ messages in thread
From: Ajay.Kathat @ 2020-08-20 5:58 UTC (permalink / raw)
To: dinghao.liu, kjlu
Cc: Claudiu.Beznea, kvalo, davem, kuba, gregkh, adham.abozaeid,
linux-wireless, netdev, linux-kernel
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@zju.edu.cn>
Acked-by: Ajay Singh <ajay.kathat@microchip.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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] [v2] wilc1000: Fix memleak in wilc_bus_probe
2020-08-20 5:52 [PATCH] [v2] wilc1000: Fix memleak in wilc_bus_probe Dinghao Liu
2020-08-20 5:58 ` Ajay.Kathat
@ 2020-08-25 8:12 ` Claudiu.Beznea
2020-08-27 10:03 ` Kalle Valo
2 siblings, 0 replies; 4+ messages in thread
From: Claudiu.Beznea @ 2020-08-25 8:12 UTC (permalink / raw)
To: dinghao.liu, kjlu
Cc: Ajay.Kathat, kvalo, davem, kuba, gregkh, adham.abozaeid,
linux-wireless, netdev, linux-kernel
Hi Dinghao,
On 20.08.2020 08:52, 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@zju.edu.cn>
> ---
>
> 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);
Same here as in the reply to patch "wilc1000: Fix memleak in wilc_sdio_probe".
> 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] [v2] wilc1000: Fix memleak in wilc_bus_probe
2020-08-20 5:52 [PATCH] [v2] wilc1000: Fix memleak in wilc_bus_probe Dinghao Liu
2020-08-20 5:58 ` Ajay.Kathat
2020-08-25 8:12 ` Claudiu.Beznea
@ 2020-08-27 10:03 ` Kalle Valo
2 siblings, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2020-08-27 10:03 UTC (permalink / raw)
To: Dinghao Liu
Cc: dinghao.liu, kjlu, Ajay Singh, Claudiu Beznea, David S. Miller,
Jakub Kicinski, Greg Kroah-Hartman, Adham Abozaeid,
linux-wireless, netdev, linux-kernel
Dinghao Liu <dinghao.liu@zju.edu.cn> wrote:
> 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@zju.edu.cn>
> Acked-by: Ajay Singh <ajay.kathat@microchip.com>
Patch applied to wireless-drivers-next.git, thanks.
9a19a939abfa wilc1000: Fix memleak in wilc_bus_probe
--
https://patchwork.kernel.org/patch/11725515/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-27 10:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-20 5:52 [PATCH] [v2] wilc1000: Fix memleak in wilc_bus_probe Dinghao Liu
2020-08-20 5:58 ` Ajay.Kathat
2020-08-25 8:12 ` Claudiu.Beznea
2020-08-27 10:03 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).