2016-05-17 23:16:55

by Heinrich Schuchardt

Subject: [PATCH 1/1] mwiflex: avoid possible null pointer dereference

Do not dereference card before checking against NULL value.

Signed-off-by: Heinrich Schuchardt <[email protected]>
---
drivers/net/wireless/marvell/mwifiex/pcie.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 0c7937e..ae1f79e 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2901,10 +2901,11 @@ static void mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
{
struct pcie_service_card *card = adapter->card;
const struct mwifiex_pcie_card_reg *reg;
- struct pci_dev *pdev = card->dev;
+ struct pci_dev *pdev;
int i;

if (card) {
+ pdev = card->dev;
if (card->msix_enable) {
for (i = 0; i < MWIFIEX_NUM_MSIX_VECTORS; i++)
synchronize_irq(card->msix_entries[i].vector);
--
2.1.4

2016-06-14 14:21:45

by Kalle Valo

Subject: Re: [1/1] mwiflex: avoid possible null pointer dereference

Heinrich Schuchardt <[email protected]> wrote:
> Do not dereference card before checking against NULL value.
>
> Signed-off-by: Heinrich Schuchardt <[email protected]>

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

141bcf099076 mwiflex: avoid possible null pointer dereference

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