diff options
| author | Dan Williams <dcbw@redhat.com> | 2019-07-24 09:38:15 -0500 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2019-08-06 15:35:59 +0300 |
| commit | 3915a252ce71b836a830bcc537220389a3acf3a5 (patch) | |
| tree | 0a121c8462c49e657cfa944bbc6c145ae3d0c4de /drivers/net/wireless/marvell | |
| parent | b95c732234fa40319c6aae2db6b35e9a7f41d79c (diff) | |
libertas: Fix a double free in if_spi_c2h_data()
The lbs_process_rxed_packet() frees the skb. It didn't originally, but
we fixed it in commit f54930f36311 ("libertas: don't leak skb on receive
error").
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell')
| -rw-r--r-- | drivers/net/wireless/marvell/libertas/if_spi.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/wireless/marvell/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c index 27067e79e83f..d07fe82c557e 100644 --- a/drivers/net/wireless/marvell/libertas/if_spi.c +++ b/drivers/net/wireless/marvell/libertas/if_spi.c @@ -766,19 +766,15 @@ static int if_spi_c2h_data(struct if_spi_card *card) /* Read the data from the WLAN module into our skb... */ err = spu_read(card, IF_SPI_DATA_RDWRPORT_REG, data, ALIGN(len, 4)); - if (err) - goto free_skb; + if (err) { + dev_kfree_skb(skb); + goto out; + } /* pass the SKB to libertas */ err = lbs_process_rxed_packet(card->priv, skb); - if (err) - goto free_skb; - - /* success */ - goto out; + /* lbs_process_rxed_packet() consumes the skb */ -free_skb: - dev_kfree_skb(skb); out: if (err) netdev_err(priv->dev, "%s: err=%d\n", __func__, err); |