34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 141bcf099076df1a74317a5b14dcd56c933b9de8 Mon Sep 17 00:00:00 2001
|
|
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
|
Date: Wed, 18 May 2016 01:16:01 +0200
|
|
Subject: mwiflex: avoid possible null pointer dereference
|
|
|
|
Do not dereference card before checking against NULL value.
|
|
|
|
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
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 9246ce8..a35db02 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);
|
|
--
|
|
cgit v0.12
|
|
|