public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wilc1000: fix double free error in probe()

Browse source 
Smatch complains that there is a double free in probe:

drivers/net/wireless/microchip/wilc1000/spi.c:186 wilc_bus_probe() error: double free of 'spi_priv'
drivers/net/wireless/microchip/wilc1000/sdio.c:163 wilc_sdio_probe() error: double free of 'sdio_priv'

The problem is that wilc_netdev_cleanup() function frees "wilc->bus_data".
That's confusing and a layering violation.  Leave the frees in probe(),
delete the free in wilc_netdev_cleanup(), and add some new frees to the
remove() functions.

Fixes: dc8b338f3b ("wilc1000: use goto labels on error path")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20211217150311.GC16611@kili
This commit is contained in:
Dan Carpenter 2021-12-17 18:03:12 +03:00 • committed by Kalle Valo
parent 97c0979d0d
commit 4894edacfa
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/wireless/microchip/wilc1000/netdev.c
View file

@ -905,7 +905,6 @@ void wilc_netdev_cleanup(struct wilc *wilc)
wilc_wlan_cfg_deinit(wilc); wilc_wlan_cfg_deinit(wilc);
wlan_deinit_locks(wilc); wlan_deinit_locks(wilc);
kfree(wilc->bus_data);
wiphy_unregister(wilc->wiphy); wiphy_unregister(wilc->wiphy);
wiphy_free(wilc->wiphy); wiphy_free(wilc->wiphy);
} }

2
drivers/net/wireless/microchip/wilc1000/sdio.c
View file

@ -167,9 +167,11 @@ free:
static void wilc_sdio_remove(struct sdio_func *func) static void wilc_sdio_remove(struct sdio_func *func)
{ {
struct wilc *wilc = sdio_get_drvdata(func); struct wilc *wilc = sdio_get_drvdata(func);
struct wilc_sdio *sdio_priv = wilc->bus_data;
clk_disable_unprepare(wilc->rtc_clk); clk_disable_unprepare(wilc->rtc_clk);
wilc_netdev_cleanup(wilc); wilc_netdev_cleanup(wilc);
kfree(sdio_priv);
} }
static int wilc_sdio_reset(struct wilc *wilc) static int wilc_sdio_reset(struct wilc *wilc)

2
drivers/net/wireless/microchip/wilc1000/spi.c
View file

@ -190,9 +190,11 @@ free:
static int wilc_bus_remove(struct spi_device *spi) static int wilc_bus_remove(struct spi_device *spi)
{ {
struct wilc *wilc = spi_get_drvdata(spi); struct wilc *wilc = spi_get_drvdata(spi);
struct wilc_spi *spi_priv = wilc->bus_data;
clk_disable_unprepare(wilc->rtc_clk); clk_disable_unprepare(wilc->rtc_clk);
wilc_netdev_cleanup(wilc); wilc_netdev_cleanup(wilc);
kfree(spi_priv);
return 0; return 0;
} }