]> git.baikalelectronics.ru Git - kernel.git/commitdiff
wifi: iwl3945: Add missing check for create_singlethread_workqueue
authorJiasheng Jiang <jiasheng@iscas.ac.cn>
Wed, 8 Feb 2023 06:30:32 +0000 (14:30 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 11 Mar 2023 15:43:42 +0000 (16:43 +0100)
[ Upstream commit 1fdeb8b9f29dfd64805bb49475ac7566a3cb06cb ]

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/20230208063032.42763-2-jiasheng@iscas.ac.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/intel/iwlegacy/3945-mac.c

index 206b43b9dff86118b38007130dad323eaaa6de6c..a1bd61d5e024de994f3cee760a714b465b2920e1 100644 (file)
@@ -3382,10 +3382,12 @@ static DEVICE_ATTR(dump_errors, 0200, NULL, il3945_dump_error_log);
  *
  *****************************************************************************/
 
-static void
+static int
 il3945_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);
 
@@ -3404,6 +3406,8 @@ il3945_setup_deferred_work(struct il_priv *il)
        tasklet_init(&il->irq_tasklet,
                     il3945_irq_tasklet,
                     (unsigned long)il);
+
+       return 0;
 }
 
 static void
@@ -3725,7 +3729,10 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
 
        il_set_rxon_channel(il, &il->bands[NL80211_BAND_2GHZ].channels[5]);
-       il3945_setup_deferred_work(il);
+       err = il3945_setup_deferred_work(il);
+       if (err)
+               goto out_remove_sysfs;
+
        il3945_setup_handlers(il);
        il_power_initialize(il);
 
@@ -3737,7 +3744,7 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        err = il3945_setup_mac(il);
        if (err)
-               goto out_remove_sysfs;
+               goto out_destroy_workqueue;
 
        il_dbgfs_register(il, DRV_NAME);
 
@@ -3746,9 +3753,10 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        return 0;
 
-out_remove_sysfs:
+out_destroy_workqueue:
        destroy_workqueue(il->workqueue);
        il->workqueue = NULL;
+out_remove_sysfs:
        sysfs_remove_group(&pdev->dev.kobj, &il3945_attribute_group);
 out_release_irq:
        free_irq(il->pci_dev->irq, il);