2016-07-15 12:49:27

by Amitkumar Karwar

Subject: [PATCH] mwifiex: Fix request_irq() failure handling

From: Karthik D A <[email protected]>

It's been observed that request_irq() failure leads to a system crash
due to a bug in mwifiex driver.
When this failure happens, mwifiex_add_card() already takes care of
clearing and freeing adapter->card pointer. This patch removes the
redundant cleanup code causing crash.

Signed-off-by: Karthik D A <[email protected]>
Signed-off-by: Amitkumar Karwar <[email protected]>
---
drivers/net/wireless/marvell/mwifiex/pcie.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index e54a98a..d61d4ad 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -202,7 +202,6 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
if (mwifiex_add_card(card, &add_remove_card_sem, &pcie_ops,
MWIFIEX_PCIE)) {
pr_err("%s failed\n", __func__);
- kfree(card);
return -1;
}

@@ -2843,7 +2842,6 @@ static int mwifiex_pcie_request_irq(struct mwifiex_adapter *adapter)
"MRVL_PCIE", &card->share_irq_ctx);
if (ret) {
pr_err("request_irq failed: ret=%d\n", ret);
- adapter->card = NULL;
return -1;
}

--
1.9.1

2016-07-18 19:42:33

by Kalle Valo

Subject: Re: mwifiex: Fix request_irq() failure handling

Amitkumar Karwar <[email protected]> wrote:
> From: Karthik D A <[email protected]>
>
> It's been observed that request_irq() failure leads to a system crash
> due to a bug in mwifiex driver.
> When this failure happens, mwifiex_add_card() already takes care of
> clearing and freeing adapter->card pointer. This patch removes the
> redundant cleanup code causing crash.
>
> Signed-off-by: Karthik D A <[email protected]>
> Signed-off-by: Amitkumar Karwar <[email protected]>

Thanks, 1 patch applied to wireless-drivers-next.git:

2af86f9d954e mwifiex: Fix request_irq() failure handling

--
Sent by pwcli
https://patchwork.kernel.org/patch/9231905/