Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1354904 > unrolled thread
| Started by | Dan Carpenter <dan.carpenter@oracle.com> |
|---|---|
| First post | 2016-03-10 08:50 +0100 |
| Last post | 2016-03-11 18:50 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[patch] ata: ahci_xgene: dereferencing uninitialized pointer in probe Dan Carpenter <dan.carpenter@oracle.com> - 2016-03-10 08:50 +0100
Re: [patch] ata: ahci_xgene: dereferencing uninitialized pointer in probe Tejun Heo <tj@kernel.org> - 2016-03-11 18:50 +0100
| From | Dan Carpenter <dan.carpenter@oracle.com> |
|---|---|
| Date | 2016-03-10 08:50 +0100 |
| Subject | [patch] ata: ahci_xgene: dereferencing uninitialized pointer in probe |
| Message-ID | <rb3w6-3HD-13@gated-at.bofh.it> |
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>
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index 8e3f7fa..73b19b2 100644
--- 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
[toc] | [next] | [standalone]
| From | Tejun Heo <tj@kernel.org> |
|---|---|
| Date | 2016-03-11 18:50 +0100 |
| Subject | Re: [patch] ata: ahci_xgene: dereferencing uninitialized pointer in probe |
| Message-ID | <rbzmh-1in-3@gated-at.bofh.it> |
| In reply to | #1354904 |
On Thu, Mar 10, 2016 at 10:45:32AM +0300, Dan Carpenter wrote:
> 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>
Applied to libata/for-4.6.
Thanks.
--
tejun
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web