| Message ID | 20130509192913.17473.94947.stgit@bhelgaas-glaptop |
|---|---|
| State | Accepted |
| Headers | show |
On Thursday, May 09, 2013 01:29:13 PM Bjorn Helgaas wrote: > We should check the acpi_resource_to_address64() return value, which > also removes the need to validate the resource type beforehand. > No functional change. > > Found by Coverity (CID 113815). > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > drivers/acpi/pci_root.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index ac8688b..c956434 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -100,13 +100,12 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data) > { > struct resource *res = data; > struct acpi_resource_address64 address; > + acpi_status status; > > - if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 && > - resource->type != ACPI_RESOURCE_TYPE_ADDRESS32 && > - resource->type != ACPI_RESOURCE_TYPE_ADDRESS64) > + status = acpi_resource_to_address64(resource, &address); > + if (ACPI_FAILURE(status)) > return AE_OK; > > - acpi_resource_to_address64(resource, &address); > if ((address.address_length > 0) && > (address.resource_type == ACPI_BUS_NUMBER_RANGE)) { > res->start = address.minimum; > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index ac8688b..c956434 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -100,13 +100,12 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data) { struct resource *res = data; struct acpi_resource_address64 address; + acpi_status status; - if (resource->type != ACPI_RESOURCE_TYPE_ADDRESS16 && - resource->type != ACPI_RESOURCE_TYPE_ADDRESS32 && - resource->type != ACPI_RESOURCE_TYPE_ADDRESS64) + status = acpi_resource_to_address64(resource, &address); + if (ACPI_FAILURE(status)) return AE_OK; - acpi_resource_to_address64(resource, &address); if ((address.address_length > 0) && (address.resource_type == ACPI_BUS_NUMBER_RANGE)) { res->start = address.minimum;
We should check the acpi_resource_to_address64() return value, which also removes the need to validate the resource type beforehand. No functional change. Found by Coverity (CID 113815). Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- drivers/acpi/pci_root.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html