public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [5/7] i386/x86-64: Remove checks for value == NULL in PCI config space access
@ 2006-04-11 10:54 Andi Kleen
  0 siblings, 0 replies; only message in thread
From: Andi Kleen @ 2006-04-11 10:54 UTC (permalink / raw)
  To: torvalds; +Cc: discuss, akpm, linux-kernel


Nobody should pass NULL here. Could in theory make it a BUG, 
but the NULL pointer oops will do as well.

Signed-off-by: Andi Kleen <ak@suse.de>

---
 arch/i386/pci/direct.c     |    6 ++++--
 arch/i386/pci/mmconfig.c   |    2 +-
 arch/x86_64/pci/mmconfig.c |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

Index: linux/arch/i386/pci/direct.c
===================================================================
--- linux.orig/arch/i386/pci/direct.c
+++ linux/arch/i386/pci/direct.c
@@ -19,7 +19,7 @@ int pci_conf1_read(unsigned int seg, uns
 {
 	unsigned long flags;
 
-	if (!value || (bus > 255) || (devfn > 255) || (reg > 255)) {
+	if ((bus > 255) || (devfn > 255) || (reg > 255)) {
 		*value = -1;
 		return -EINVAL;
 	}
@@ -94,8 +94,10 @@ static int pci_conf2_read(unsigned int s
 	unsigned long flags;
 	int dev, fn;
 
-	if (!value || (bus > 255) || (devfn > 255) || (reg > 255))
+	if ((bus > 255) || (devfn > 255) || (reg > 255)) {
+		*value = -1;
 		return -EINVAL;
+	}
 
 	dev = PCI_SLOT(devfn);
 	fn = PCI_FUNC(devfn);
Index: linux/arch/i386/pci/mmconfig.c
===================================================================
--- linux.orig/arch/i386/pci/mmconfig.c
+++ linux/arch/i386/pci/mmconfig.c
@@ -80,7 +80,7 @@ static int pci_mmcfg_read(unsigned int s
 	unsigned long flags;
 	u32 base;
 
-	if (!value || (bus > 255) || (devfn > 255) || (reg > 4095)) {
+	if ((bus > 255) || (devfn > 255) || (reg > 4095)) {
 		*value = -1;
 		return -EINVAL;
 	}
Index: linux/arch/x86_64/pci/mmconfig.c
===================================================================
--- linux.orig/arch/x86_64/pci/mmconfig.c
+++ linux/arch/x86_64/pci/mmconfig.c
@@ -75,7 +75,7 @@ static int pci_mmcfg_read(unsigned int s
 	char __iomem *addr;
 
 	/* Why do we have this when nobody checks it. How about a BUG()!? -AK */
-	if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095))) {
+	if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) {
 		*value = -1;
 		return -EINVAL;
 	}

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2006-04-11 10:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-11 10:54 [PATCH] [5/7] i386/x86-64: Remove checks for value == NULL in PCI config space access Andi Kleen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox