diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-03-10 10:45:32 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-11 11:21:10 +0200 |
| commit | 5dd660ee0ebedf9aea7bbf7360584668af3cecce (patch) | |
| tree | bdc63d73f8729d2d50a923d15a7330f7c0a83e9c | |
| parent | be0860081ab64f99bcdaeaaf106778b1a16a3198 (diff) | |
| download | lwn-5dd660ee0ebedf9aea7bbf7360584668af3cecce.tar.gz lwn-5dd660ee0ebedf9aea7bbf7360584668af3cecce.zip | |
ata: ahci_xgene: dereferencing uninitialized pointer in probe
commit 8134233e8d346aaa1c929dc510e75482ae318bce upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/ata/ahci_xgene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c index e2c6d9e0c5ac..e916bff6cee8 100644 --- a/drivers/ata/ahci_xgene.c +++ b/drivers/ata/ahci_xgene.c @@ -739,9 +739,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 |