libertas: fix a potential NULL pointer dereference

commit 7da413a18583baaf35dd4a8eb414fa410367d7f2 upstream.

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>
[krzk: backport applied to different path - without marvell subdir]
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 33ceda296c9c61ece7d14a8484cd551b50026dfa..45d68ee682f6df9bcbf5c864e25c6da78080c87b 100644 (file)
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -1229,6 +1229,10 @@ static int if_sdio_probe(struct sdio_func *func,
 
        spin_lock_init(&card->lock);
        card->workqueue = create_workqueue("libertas_sdio");
+       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);
 
@@ -1282,6 +1286,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;