Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c002d274 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Greg Kroah-Hartman
Browse files

wifi: iwl4965: Add missing check for create_singlethread_workqueue() 



[ Upstream commit 26e6775f75517ad6844fe5b79bc5f3fa8c22ee61 ]

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

Fixes: b481de9c ("[IWLWIFI]: add iwlwifi wireless drivers")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Acked-by: default avatarStanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230209010748.45454-1-jiasheng@iscas.ac.cn


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7e594abc

drivers/net/wireless/intel/iwlegacy/4965-mac.c

+10 −2
Original line number Diff line number Diff line
@@ -6217,10 +6217,12 @@ il4965_bg_txpower_work(struct work_struct *work) 
	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);