mwifiex: fix double free
authorTom Rix <trix@redhat.com>
Sun, 4 Oct 2020 13:19:31 +0000 (06:19 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 08:07:07 +0000 (09:07 +0100)
[ Upstream commit 53708f4fd9cfe389beab5c8daa763bcd0e0b4aef ]

clang static analysis reports this problem:

sdio.c:2403:3: warning: Attempt to free released memory
        kfree(card->mpa_rx.buf);
        ^~~~~~~~~~~~~~~~~~~~~~~

When mwifiex_init_sdio() fails in its first call to
mwifiex_alloc_sdio_mpa_buffer, it falls back to calling it
again.  If the second alloc of mpa_tx.buf fails, the error
handler will try to free the old, previously freed mpa_rx.buf.
Reviewing the code, it looks like a second double free would
happen with mwifiex_cleanup_sdio().

So set both pointers to NULL when they are freed.

Fixes: 5e6e3a92b9a4 ("wireless: mwifiex: initial commit for Marvell mwifiex driver")
Signed-off-by: Tom Rix <trix@redhat.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201004131931.29782-1-trix@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/marvell/mwifiex/sdio.c

index fd5183c10c4ed1b8ce74cac7093ba247415e7d1e..0e858621eef3210f75bafac03362627fbfe2664c 100644 (file)
@@ -1973,6 +1973,8 @@ error:
                kfree(card->mpa_rx.buf);
                card->mpa_tx.buf_size = 0;
                card->mpa_rx.buf_size = 0;
+               card->mpa_tx.buf = NULL;
+               card->mpa_rx.buf = NULL;
        }
 
        return ret;