Skip to contentSkip to conversation

pci/pcie/aer/aerdrv_acpi.c: inconsequent NULL checking

PATCH New Adrian Bunk 2 participants 5 messages Feb 19, 2008 – Feb 22, 2008 PCI

lore
Share & tools
lore
#0 lore raw

The Coverity checker spotted the following inconsequent NULL checking introduced by commit 3c75e23784e6ed5f4841de43d0750fd9b37bafcb:

<-- snip -->

...
int aer_osc_setup(struct pcie_device *pciedev)
{
... vvvvvvvvv

        while (pdev->bus && pdev->bus->self)
                pdev = pdev->bus->self;
        handle = acpi_get_pci_rootbridge_handle(
                pci_domain_nr(pdev->bus), pdev->bus->number);

... ^^^^^^^^^^^^^^^^^

<-- snip -->

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#1 lore raw
Quoted 11 lines · Adrian Bunk

The Coverity checker spotted the following inconsequent NULL checking introduced by commit 3c75e23784e6ed5f4841de43d0750fd9b37bafcb:

<-- snip -->

...
int aer_osc_setup(struct pcie_device *pciedev)
{
... vvvvvvvvv

        while (pdev->bus && pdev->bus->self)
                pdev = pdev->bus->self;

That could probably change to just pdev->bus->self, as a bus should always be there for a pdev, so I don't see this as a problem.

thanks,

greg k-h

#2 lore raw
Quoted 13 lines · Greg KH
Quoted 11 lines · Adrian Bunk

The Coverity checker spotted the following inconsequent NULL checking introduced by commit 3c75e23784e6ed5f4841de43d0750fd9b37bafcb:

<-- snip -->

...
int aer_osc_setup(struct pcie_device *pciedev)
{
... vvvvvvvvv

        while (pdev->bus && pdev->bus->self)
                pdev = pdev->bus->self;
Quoted 2 lines

That could probably change to just pdev->bus->self, as a bus should always be there for a pdev, so I don't see this as a problem.

I'm not claiming this specific case was a problem.

When a NULL check is only performed in some cases that's sometimes a bug that has to be fixed and in most cases a not required check that should be removed at some point in time.

Quoted 3 lines

thanks,

greg k-h

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#3 lore raw
Quoted 14 lines · Adrian Bunk
Quoted 13 lines · Greg KH
Quoted 11 lines · Adrian Bunk

The Coverity checker spotted the following inconsequent NULL checking introduced by commit 3c75e23784e6ed5f4841de43d0750fd9b37bafcb:

<-- snip -->

...
int aer_osc_setup(struct pcie_device *pciedev)
{
... vvvvvvvvv

        while (pdev->bus && pdev->bus->self)
                pdev = pdev->bus->self;
Quoted 4 lines
Quoted 2 lines

That could probably change to just pdev->bus->self, as a bus should always be there for a pdev, so I don't see this as a problem.

I'm not claiming this specific case was a problem.

Well, Coverity did :)

Quoted 3 lines

When a NULL check is only performed in some cases that's sometimes a bug that has to be fixed and in most cases a not required check that should be removed at some point in time.

I agree, patches are always welcome...

thanks,

greg k-h

#4 lore raw

PATCH 1/1 pci/pcie/aer/aerdrv_acpi.c: remove unneeded NULL check

Quoted 15 lines · Greg KH
Quoted 14 lines · Adrian Bunk
Quoted 13 lines · Greg KH
Quoted 11 lines · Adrian Bunk

The Coverity checker spotted the following inconsequent NULL checking introduced by commit 3c75e23784e6ed5f4841de43d0750fd9b37bafcb:

<-- snip -->

...
int aer_osc_setup(struct pcie_device *pciedev)
{
... vvvvvvvvv

        while (pdev->bus && pdev->bus->self)
                pdev = pdev->bus->self;
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

That could probably change to just pdev->bus->self, as a bus should always be there for a pdev, so I don't see this as a problem.

I'm not claiming this specific case was a problem.

Well, Coverity did :)

It only said it's once checked and once not.

Quoted 5 lines
Quoted 3 lines

When a NULL check is only performed in some cases that's sometimes a bug that has to be fixed and in most cases a not required check that should be removed at some point in time.

I agree, patches are always welcome...

Patch below.

Quoted 3 lines

thanks,

greg k-h

cu
Adrian

<-- snip -->

There's no reason for checking pdev->bus for being NULL here (and we'd anyway Oops 3 lines below if it was).

---
74832021c82be6e2ed6055f4f25dbf152df67cf5 diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c index 8c199ae..1e2a858 100644

drivers/pci/pcie/aer/aerdrv_acpi.c +1 -1
@@ -34,7 +34,7 @@ int aer_osc_setup(struct pcie_device *pciedev)
 	acpi_handle handle = 0;
 
 	/* Find root host bridge */
-	while (pdev->bus && pdev->bus->self)
+	while (pdev->bus->self)
 		pdev = pdev->bus->self;
 	handle = acpi_get_pci_rootbridge_handle(
 		pci_domain_nr(pdev->bus), pdev->bus->number);