libertas: fix a potential NULL pointer dereference
authorAllen Pais <allen.pais@oracle.com>
Wed, 18 Sep 2019 16:35:00 +0000 (22:05 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:43:11 +0000 (16:43 +0100)
[ 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>
drivers/net/wireless/marvell/libertas/if_sdio.c

index 242d884..30f1025 100644 (file)
@@ -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;