* [PATCH 2/2][Patch-next -v2] ACPI, APEI, HEST Fix the unsuitable usage of platform_data.
@ 2010-08-17 23:49 Jin Dongming
2010-08-18 4:18 ` Huang Ying
0 siblings, 1 reply; 4+ messages in thread
From: Jin Dongming @ 2010-08-17 23:49 UTC (permalink / raw)
To: Huang Ying
Cc: Randy Dunlap, Stephen Rothwell, Andi Kleen, Hidetoshi Seto, ACPI,
LKLM
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 <jin.dongming@np.css.fujitsu.com>
---
drivers/acpi/apei/ghes.c | 2 +-
drivers/acpi/apei/hest.c | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 385a605..0d505e5 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -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;
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 343168d..1a3508a 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -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;
--
1.7.1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2][Patch-next -v2] ACPI, APEI, HEST Fix the unsuitable usage of platform_data.
2010-08-17 23:49 Jin Dongming
@ 2010-08-18 4:18 ` Huang Ying
0 siblings, 0 replies; 4+ messages in thread
From: Huang Ying @ 2010-08-18 4:18 UTC (permalink / raw)
To: Jin Dongming
Cc: Randy Dunlap, Stephen Rothwell, Andi Kleen, Hidetoshi Seto, ACPI,
LKLM
On Wed, 2010-08-18 at 07:49 +0800, Jin Dongming wrote:
> 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 <jin.dongming@np.css.fujitsu.com>
Acked-by: Huang Ying <ying.huang@intel.com>
Best Regards,
Huang Ying
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2][Patch-next -v2] ACPI, APEI, HEST Fix the unsuitable usage of platform_data.
@ 2010-09-02 2:31 Jin Dongming
2010-09-02 2:33 ` Huang Ying
0 siblings, 1 reply; 4+ messages in thread
From: Jin Dongming @ 2010-09-02 2:31 UTC (permalink / raw)
To: APEI-lenb
Cc: Huang Ying, Andi Kleen, ACPI, LKLM, Stephen Rothwell,
Randy Dunlap, Hidetoshi Seto
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 <jin.dongming@np.css.fujitsu.com>
---
drivers/acpi/apei/ghes.c | 2 +-
drivers/acpi/apei/hest.c | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 385a605..0d505e5 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -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;
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 343168d..1a3508a 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -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;
-- 1.7.1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2][Patch-next -v2] ACPI, APEI, HEST Fix the unsuitable usage of platform_data.
2010-09-02 2:31 [PATCH 2/2][Patch-next -v2] ACPI, APEI, HEST Fix the unsuitable usage of platform_data Jin Dongming
@ 2010-09-02 2:33 ` Huang Ying
0 siblings, 0 replies; 4+ messages in thread
From: Huang Ying @ 2010-09-02 2:33 UTC (permalink / raw)
To: Jin Dongming
Cc: APEI-lenb, Andi Kleen, ACPI, LKLM, Stephen Rothwell, Randy Dunlap,
Hidetoshi Seto
On Thu, 2010-09-02 at 10:31 +0800, Jin Dongming wrote:
> 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 <jin.dongming@np.css.fujitsu.com>
Acked-by: Huang Ying <ying.huang@intel.com>
Best Regards,
Huang Ying
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-02 2:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-02 2:31 [PATCH 2/2][Patch-next -v2] ACPI, APEI, HEST Fix the unsuitable usage of platform_data Jin Dongming
2010-09-02 2:33 ` Huang Ying
-- strict thread matches above, loose matches on Subject: below --
2010-08-17 23:49 Jin Dongming
2010-08-18 4:18 ` Huang Ying
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox