]> git.baikalelectronics.ru Git - kernel.git/commitdiff
wifi: iwl4965: Add missing check for create_singlethread_workqueue()
authorJiasheng Jiang <jiasheng@iscas.ac.cn>
Thu, 9 Feb 2023 01:07:48 +0000 (09:07 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 11 Mar 2023 15:43:42 +0000 (16:43 +0100)
[ Upstream commit 26e6775f75517ad6844fe5b79bc5f3fa8c22ee61 ]

Add the check for the return value of the create_singlethread_workqueue()
in order to avoid NULL pointer dereference.

Fixes: f71f97212c63 ("[IWLWIFI]: add iwlwifi wireless drivers")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230209010748.45454-1-jiasheng@iscas.ac.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/intel/iwlegacy/4965-mac.c

index 5fe17039a33754db82d6783b0213f23c6419f8f8..feeb57cadc1caa471ef899a4021795fa2d76c719 100644 (file)
@@ -6217,10 +6217,12 @@ out:
        mutex_unlock(&il->mutex);
 }
 
-static void
+static int
 il4965_setup_deferred_work(struct il_priv *il)
 {
        il->workqueue = create_singlethread_workqueue(DRV_NAME);
+       if (!il->workqueue)
+               return -ENOMEM;
 
        init_waitqueue_head(&il->wait_command_queue);
 
@@ -6241,6 +6243,8 @@ il4965_setup_deferred_work(struct il_priv *il)
        tasklet_init(&il->irq_tasklet,
                     il4965_irq_tasklet,
                     (unsigned long)il);
+
+       return 0;
 }
 
 static void
@@ -6630,7 +6634,10 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_disable_msi;
        }
 
-       il4965_setup_deferred_work(il);
+       err = il4965_setup_deferred_work(il);
+       if (err)
+               goto out_free_irq;
+
        il4965_setup_handlers(il);
 
        /*********************************************
@@ -6668,6 +6675,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 out_destroy_workqueue:
        destroy_workqueue(il->workqueue);
        il->workqueue = NULL;
+out_free_irq:
        free_irq(il->pci_dev->irq, il);
 out_disable_msi:
        pci_disable_msi(il->pci_dev);