ACPI, APEI, HEST Fix the unsuitable usage of platform_data.

PATCH In review Jin Dongming 2 participants 2 messages Aug 17, 2010 – Aug 18, 2010

Subsystems (2)

ACPI ACPI APEI

lore

Share & tools

lore

Jin Dongming

author

2010-08-17 23:48 UTC #0 lore raw

PATCH 2/2 ACPI, APEI, HEST Fix the unsuitable usage of platform_data.

platform_data in hest_parse_ghes() is used for saving the address of entry information of erst_tab. When the device is failed to be added, platform_data will be freed by platform_device_put(). But the value saved in platform_data should not be freed here. If it is done, it will make system panic.

So I think platform_data should save the address of allocated memory which saves entry information of erst_tab.

This patch fixed it and I confirmed it on x86_64 next-tree.

Signed-off-by Jin Dongming <[email protected]>

---
 drivers/acpi/apei/ghes.c |    2 +-
 drivers/acpi/apei/hest.c |   11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

drivers/acpi/apei/ghes.c +1 -1

index 385a605..0d505e5 100644
@@ -302,7 +302,7 @@ static int __devinit ghes_probe(struct platform_device *ghes_dev)
 	struct ghes *ghes = NULL;
 	int rc = -EINVAL;
 
-	generic = ghes_dev->dev.platform_data;
+	generic = *(struct acpi_hest_generic **)ghes_dev->dev.platform_data;
 	if (!generic->enabled)
 		return -ENODEV;

drivers/acpi/apei/hest.c +7 -4

index 343168d..1a3508a 100644
@@ -137,20 +137,23 @@ static int hest_parse_ghes_count(struct acpi_hest_header *hest_hdr, void *data)
 
 static int hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
 {
-	struct acpi_hest_generic *generic;
 	struct platform_device *ghes_dev;
 	struct ghes_arr *ghes_arr = data;
 	int rc;
 
 	if (hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR)
 		return 0;
-	generic = (struct acpi_hest_generic *)hest_hdr;
-	if (!generic->enabled)
+
+	if (!((struct acpi_hest_generic *)hest_hdr)->enabled)
 		return 0;
 	ghes_dev = platform_device_alloc("GHES", hest_hdr->source_id);
 	if (!ghes_dev)
 		return -ENOMEM;
-	ghes_dev->dev.platform_data = generic;
+
+	rc = platform_device_add_data(ghes_dev, &hest_hdr, sizeof(void *));
+	if (rc)
+		goto err;
+
 	rc = platform_device_add(ghes_dev);
 	if (rc)
 		goto err;

Signature · 1 line

1.7.1.1

Huang Ying

Acked-by on v1 2/2

2010-08-18 04:18 UTC #1 lore raw

Quoted 11 lines · Jin Dongming

platform_data in hest_parse_ghes() is used for saving the address of entry information of erst_tab. When the device is failed to be added, platform_data will be freed by platform_device_put(). But the value saved in platform_data should not be freed here. If it is done, it will make system panic.
So I think platform_data should save the address of allocated memory which saves entry information of erst_tab.
This patch fixed it and I confirmed it on x86_64 next-tree.
Signed-off-by Jin Dongming <[email protected]>

Acked-by Huang Ying <[email protected]>

Best Regards,
Huang Ying