ata: ahci_xgene: dereferencing uninitialized pointer in probe
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 10 Mar 2016 07:45:32 +0000 (10:45 +0300)
committerTejun Heo <tj@kernel.org>
Fri, 11 Mar 2016 17:40:34 +0000 (12:40 -0500)
If the call to acpi_get_object_info() fails then "info" hasn't been
initialized.  In that situation, we already know that "version" should
be XGENE_AHCI_V1 so we don't actually need to dereference "info".

Fixes: c9802a4be661 ('ata: ahci_xgene: Add AHCI Support for 2nd HW version of APM X-Gene SoC AHCI SATA Host controller.')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/ahci_xgene.c

index 8e3f7faf00d383f8eea284fe122e90a44ee7ce40..73b19b2771385517b094d5fd548f3abf91751b2f 100644 (file)
@@ -821,9 +821,9 @@ static int xgene_ahci_probe(struct platform_device *pdev)
                                dev_warn(&pdev->dev, "%s: Error reading device info. Assume version1\n",
                                        __func__);
                                version = XGENE_AHCI_V1;
-                       }
-                       if (info->valid & ACPI_VALID_CID)
+                       } else if (info->valid & ACPI_VALID_CID) {
                                version = XGENE_AHCI_V2;
+                       }
                }
        }
 #endif