summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Jian <liujian56@huawei.com>2020-07-17 12:01:21 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-29 11:18:32 +0300
commit988e5d2179e4e38e92b9c593845a711c8917f4b7 (patch)
tree6891ec0b2d9169886546b5ff579472886efb3c94
parent7bf93c95a9b99427c032946750e89dca39575240 (diff)
downloadlinux-988e5d2179e4e38e92b9c593845a711c8917f4b7.tar.xz
ieee802154: fix one possible memleak in adf7242_probe
[ Upstream commit 66673f96f0f968b991dc38be06102246919c663c ] When probe fail, we should destroy the workqueue. Fixes: 2795e8c25161 ("net: ieee802154: fix a potential NULL pointer dereference") Signed-off-by: Liu Jian <liujian56@huawei.com> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Link: https://lore.kernel.org/r/20200717090121.2143-1-liujian56@huawei.com Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ieee802154/adf7242.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c
index 5a37514e4234..8dbccec6ac86 100644
--- a/drivers/net/ieee802154/adf7242.c
+++ b/drivers/net/ieee802154/adf7242.c
@@ -1262,7 +1262,7 @@ static int adf7242_probe(struct spi_device *spi)
WQ_MEM_RECLAIM);
if (unlikely(!lp->wqueue)) {
ret = -ENOMEM;
- goto err_hw_init;
+ goto err_alloc_wq;
}
ret = adf7242_hw_init(lp);
@@ -1294,6 +1294,8 @@ static int adf7242_probe(struct spi_device *spi)
return ret;
err_hw_init:
+ destroy_workqueue(lp->wqueue);
+err_alloc_wq:
mutex_destroy(&lp->bmux);
ieee802154_free_hw(lp->hw);