Skip to contentSkip to conversation

ata: ahci_xgene: dereferencing uninitialized pointer in probe

PATCH Applied Dan Carpenter 2 participants 2 messages Mar 10, 2016 – Mar 11, 2016

Subsystems (2)
Kernel janitors libata
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 ata: ahci_xgene: dereferencing uninitialized pointer in probe

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 <[email protected]>
drivers/ata/ahci_xgene.c +2 -2
index 8e3f7fa..73b19b2 100644
@@ -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
Applied
#1 lore raw
Quoted 6 lines · Dan Carpenter

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 <[email protected]>

Applied to libata/for-4.6.

Thanks.

Signature · 1 line
tejun