[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1254119480-9730-1-git-send-email-dfeng@redhat.com>
Date: Mon, 28 Sep 2009 14:31:20 +0800
From: Xiaotian Feng <dfeng@...hat.com>
To: lenb@...nel.org, bjorn.helgaas@...com, achiang@...com,
andrew.patterson@...com, jbarnes@...tuousgeek.org
Cc: linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org,
Xiaotian Feng <dfeng@...hat.com>
Subject: [PATCH] acpi: pci_root: fix NULL pointer deref after resume from suspend
commit 275582 introduces acpi_get_pci_dev(), but pdev->subordinate
can be NULL, then a NULL was passed to pci_get_slot, this results
the kernel oops when resume from suspend.
This patch resolves following kernel oops:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000028
IP: [<ffffffff812217e7>] pci_get_slot+0x4c/0x8c
Signed-off-by: Xiaotian Feng <dfeng@...hat.com>
---
drivers/acpi/pci_root.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 3112221..3c35144 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -387,7 +387,11 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle handle)
if (!pdev || hnd == handle)
break;
- pbus = pdev->subordinate;
+ if (pdev->subordinate)
+ pbus = pdev->subordinate;
+ else
+ pbus = pdev->bus;
+
pci_dev_put(pdev);
}
out:
--
1.6.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists