redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] i386/x86-64: Remove checks for value == NULL in PCI config space access 

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
hifive-unleashed-5.1
Andi Kleen 2006-04-11 12:54:48 +02:00 committed by Linus Torvalds
parent 3d8a4d795c
commit ecc16ba96f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/i386/pci/direct.c
View File

@ -19,7 +19,7 @@ int pci_conf1_read(unsigned int seg, unsigned int bus,
{
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 seg, unsigned int bus,
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);

2
arch/i386/pci/mmconfig.c
View File

@ -80,7 +80,7 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
unsigned long flags;
u32 base;
if (!value || (bus > 255) || (devfn > 255) || (reg > 4095)) {
if ((bus > 255) || (devfn > 255) || (reg > 4095)) {
*value = -1;
return -EINVAL;
}

2
arch/x86_64/pci/mmconfig.c
View File

@ -75,7 +75,7 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
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;
}