From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiaotian Feng Subject: [PATCH] acpi: pci_root: fix NULL pointer deref after resume from suspend Date: Mon, 28 Sep 2009 14:31:20 +0800 Message-ID: <1254119480-9730-1-git-send-email-dfeng@redhat.com> Return-path: Received: from mx1.redhat.com ([209.132.183.28]:31144 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751151AbZI1GeN (ORCPT ); Mon, 28 Sep 2009 02:34:13 -0400 Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: lenb@kernel.org, bjorn.helgaas@hp.com, achiang@hp.com, andrew.patterson@hp.com, jbarnes@virtuousgeek.org Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaotian Feng 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: [] pci_get_slot+0x4c/0x8c Signed-off-by: Xiaotian Feng --- 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