From: Greg Kroah-Hartman <gre...@linuxfoundation.org>

From: Allen Pais <allen.p...@oracle.com>

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.p...@oracle.com>
Signed-off-by: Kalle Valo <kv...@codeaurora.org>
[krzk: backport applied to different path - without marvell subdir]
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlow...@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/net/wireless/libertas/if_sdio.c |    5 +++++
 1 file changed, 5 insertions(+)

--- 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_fun
 
        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;


Reply via email to