summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorAllen Pais <allen.pais@oracle.com>2019-09-18 19:35:00 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-31 18:43:11 +0300
commit6ab523073f222e2e3a4545cbe436ef94a33bffff (patch)
tree7435675c44f491e6194cf5a03eab3badd10fb597 /drivers/net
parent39a974f8970268e7a02933e5cd6fab3e2dd8228e (diff)
downloadlinux-6ab523073f222e2e3a4545cbe436ef94a33bffff.tar.xz
libertas: fix a potential NULL pointer dereference
[ Upstream commit 7da413a18583baaf35dd4a8eb414fa410367d7f2 ] alloc_workqueue is not checked for errors and as a result, a potential NULL dereference could occur. Signed-off-by: Allen Pais <allen.pais@oracle.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/marvell/libertas/if_sdio.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c
index 242d8845da3f..30f1025ecb9b 100644
--- a/drivers/net/wireless/marvell/libertas/if_sdio.c
+++ b/drivers/net/wireless/marvell/libertas/if_sdio.c
@@ -1179,6 +1179,10 @@ static int if_sdio_probe(struct sdio_func *func,
spin_lock_init(&card->lock);
card->workqueue = alloc_workqueue("libertas_sdio", WQ_MEM_RECLAIM, 0);
+ if (unlikely(!card->workqueue)) {
+ ret = -ENOMEM;
+ goto err_queue;
+ }
INIT_WORK(&card->packet_worker, if_sdio_host_to_card_worker);
init_waitqueue_head(&card->pwron_waitq);
@@ -1230,6 +1234,7 @@ err_activate_card:
lbs_remove_card(priv);
free:
destroy_workqueue(card->workqueue);
+err_queue:
while (card->packets) {
packet = card->packets;
card->packets = card->packets->next;