* [PATCH] iwlwifi: missing error code in iwl_trans_pcie_alloc()
@ 2017-06-14 10:44 Dan Carpenter
2017-06-14 10:49 ` Luca Coelho
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2017-06-14 10:44 UTC (permalink / raw)
To: Johannes Berg, Haim Dreyfuss
Cc: Emmanuel Grumbach, Luca Coelho, Intel Linux Wireless, Kalle Valo,
Sara Sharon, Liad Kaufman, Sharon Dvir, linux-wireless,
kernel-janitors
We don't set the error code here so we end up returning ERR_PTR(0) which
is NULL. The caller doesn't expect that so it results in a NULL
dereference.
Fixes: 2e5d4a8f61dc ("iwlwifi: pcie: Add new configuration to enable MSIX")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index a3c5d3b195ad..24420314f91b 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3100,7 +3100,8 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
init_waitqueue_head(&trans_pcie->d0i3_waitq);
if (trans_pcie->msix_enabled) {
- if (iwl_pcie_init_msix_handler(pdev, trans_pcie))
+ ret = iwl_pcie_init_msix_handler(pdev, trans_pcie);
+ if (ret)
goto out_no_pci;
} else {
ret = iwl_pcie_alloc_ict(trans);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iwlwifi: missing error code in iwl_trans_pcie_alloc()
2017-06-14 10:44 [PATCH] iwlwifi: missing error code in iwl_trans_pcie_alloc() Dan Carpenter
@ 2017-06-14 10:49 ` Luca Coelho
0 siblings, 0 replies; 2+ messages in thread
From: Luca Coelho @ 2017-06-14 10:49 UTC (permalink / raw)
To: Dan Carpenter, Johannes Berg, Haim Dreyfuss
Cc: Emmanuel Grumbach, Intel Linux Wireless, Kalle Valo, Sara Sharon,
Liad Kaufman, Sharon Dvir, linux-wireless, kernel-janitors
On Wed, 2017-06-14 at 13:44 +0300, Dan Carpenter wrote:
> We don't set the error code here so we end up returning ERR_PTR(0) which
> is NULL. The caller doesn't expect that so it results in a NULL
> dereference.
>
> Fixes: 2e5d4a8f61dc ("iwlwifi: pcie: Add new configuration to enable MSIX")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Good catch, thanks!
I'll push it to our internal tree, so it will go upstream via our normal
process.
--
Cheers,
Luca.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-14 10:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-14 10:44 [PATCH] iwlwifi: missing error code in iwl_trans_pcie_alloc() Dan Carpenter
2017-06-14 10:49 ` Luca Coelho
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox