linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Marc Zyngier <marc.zyngier@arm.com>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Paul Mackerras <paulus@samba.org>,
	Michael Ellerman <mpe@ellerman.id.au>,
	Will Deacon <will.deacon@arm.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Alexander Graf <agraf@suse.de>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org
Subject: [PATCH 2/3] powerpc: PCI: Fix lookup of linux, pci-probe-only property
Date: Fri, 14 Aug 2015 15:41:07 +0100	[thread overview]
Message-ID: <1439563268-13418-3-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1439563268-13418-1-git-send-email-marc.zyngier@arm.com>

When find_and_init_phbs() looks for the probe-only property, it seems
to trust the firmware to be correctly written, and assumes that there
is a parameter to the property.

It is conceivable that the firmware could not be that perfect, and it
could expose this property naked (at least one arm64 platform seems to
exhibit this exact behaviour). The setup code the ends up making
a decision based on whatever the property pointer points to, which
is likely to be junk.

Instead, let's check for the validity of the property, and ignore
it if the firmware couldn't make up its mind.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 arch/powerpc/platforms/pseries/setup.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index df6a704..6bdc1f9 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -490,14 +490,19 @@ static void __init find_and_init_phbs(void)
 	 */
 	if (of_chosen) {
 		const int *prop;
+		int len;
 
 		prop = of_get_property(of_chosen,
-				"linux,pci-probe-only", NULL);
+				"linux,pci-probe-only", &len);
 		if (prop) {
-			if (*prop)
-				pci_add_flags(PCI_PROBE_ONLY);
-			else
-				pci_clear_flags(PCI_PROBE_ONLY);
+			if (len) {
+				if (be32_to_cpup(prop))
+					pci_add_flags(PCI_PROBE_ONLY);
+				else
+					pci_clear_flags(PCI_PROBE_ONLY);
+			} else {
+				pr_warn("linux,pci-probe-only set without value, ignoring\n");
+			}
 		}
 	}
 }
-- 
2.1.4

  parent reply	other threads:[~2015-08-14 14:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-14 14:41 [PATCH 0/3] PCI: arm64/powerpc: Fix parsing of linux,pci-probe-only Marc Zyngier
2015-08-14 14:41 ` [PATCH 1/3] PCI: pci-host-generic: Fix lookup of linux, pci-probe-only property Marc Zyngier
2015-08-14 14:41 ` Marc Zyngier [this message]
2015-08-14 14:57   ` [PATCH 2/3] powerpc: PCI: Fix lookup of linux,pci-probe-only property Bjorn Helgaas
2015-08-14 15:44     ` Marc Zyngier
2015-08-14 14:41 ` [PATCH 3/3] arm64: dts: Drop linux, pci-probe-only from the Seattle DTS Marc Zyngier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439563268-13418-3-git-send-email-marc.zyngier@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=Suravee.Suthikulpanit@amd.com \
    --cc=agraf@suse.de \
    --cc=benh@kernel.crashing.org \
    --cc=bhelgaas@google.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=mpe@ellerman.id.au \
    --cc=paulus@samba.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).