ata: ahci_xgene: dereferencing uninitialized pointer in probe

Dan Carpenter · htejun · commit 8134233e8d34 · 2016-03-11T12:40:34.000-05:00
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: c9802a4 ('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>
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -821,9 +821,9 @@ static int xgene_ahci_probe(struct platform_device *pdev)`
`821`	`821`	`dev_warn(&pdev->dev, "%s: Error reading device info. Assume version1\n",`
`822`	`822`	`__func__);`
`823`	`823`	`version = XGENE_AHCI_V1;`
`824`		`- }`
`825`		`- if (info->valid & ACPI_VALID_CID)`
	`824`	`+ } else if (info->valid & ACPI_VALID_CID) {`
`826`	`825`	`version = XGENE_AHCI_V2;`
	`826`	`+ }`
`827`	`827`	`}`
`828`	`828`	`}`
`829`	`829`	`#endif`