diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2021-12-17 18:03:12 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2021-12-20 20:44:03 +0200 |
| commit | 4894edacfa93d7046bec4fc61fc402ac6a2ac9e8 (patch) | |
| tree | 6886541ab62427cfe9bc68561504c56f36dcfa55 /drivers/net/wireless/microchip/wilc1000/sdio.c | |
| parent | 97c0979d0d729cded6eae0d7b22d06a2eeeca3a4 (diff) | |
wilc1000: fix double free error in probe()
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: dc8b338f3bcd ("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
Diffstat (limited to 'drivers/net/wireless/microchip/wilc1000/sdio.c')
| -rw-r--r-- | drivers/net/wireless/microchip/wilc1000/sdio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/wireless/microchip/wilc1000/sdio.c index 26ebf6664342..ec595dbd8959 100644 --- a/drivers/net/wireless/microchip/wilc1000/sdio.c +++ b/drivers/net/wireless/microchip/wilc1000/sdio.c @@ -167,9 +167,11 @@ free: static void wilc_sdio_remove(struct sdio_func *func) { struct wilc *wilc = sdio_get_drvdata(func); + struct wilc_sdio *sdio_priv = wilc->bus_data; clk_disable_unprepare(wilc->rtc_clk); wilc_netdev_cleanup(wilc); + kfree(sdio_priv); } static int wilc_sdio_reset(struct wilc *wilc) |