From: Huang Ying <ying.huang@intel.com>
To: Len Brown <lenb@kernel.org>
Cc: linux-kernel@vger.kernel.org, Andi Kleen <andi@firstfloor.org>,
linux-acpi@vger.kernel.org,
Jin Dongming <jin.dongming@np.css.fujitsu.com>
Subject: [PATCH 3/5] ACPI, APEI, HEST Fix the unsuitable usage of platform_data
Date: Sun, 19 Sep 2010 11:00:33 +0800 [thread overview]
Message-ID: <1284865235-29920-4-git-send-email-ying.huang@intel.com> (raw)
In-Reply-To: <1284865235-29920-1-git-send-email-ying.huang@intel.com>
From: Jin Dongming <jin.dongming@np.css.fujitsu.com>
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.
v2:
Transport the pointer of hest_hdr to platform_data using
platform_device_add_data()
Signed-off-by: Jin Dongming <jin.dongming@np.css.fujitsu.com>
Acked-by: Huang Ying <ying.huang@intel.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
next prev parent reply other threads:[~2010-09-19 3:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-19 3:00 [PATCH 0/5] ACPI, APEI, BUG fixes for 2.6.36 Huang Ying
2010-09-19 3:00 ` [PATCH 1/5] ACPI, APEI, Fix APEI related table size checking Huang Ying
2010-09-21 12:39 ` Andi Kleen
2010-09-26 5:30 ` Huang Ying
2010-09-19 3:00 ` [PATCH 2/5] ACPI, APEI, Fix acpi_pre_map() return value Huang Ying
2010-09-21 12:47 ` Andi Kleen
2010-09-19 3:00 ` Huang Ying [this message]
2010-09-21 12:43 ` [PATCH 3/5] ACPI, APEI, HEST Fix the unsuitable usage of platform_data Andi Kleen
2010-09-22 1:05 ` Jin Dongming
2010-09-23 9:06 ` huang ying
2010-09-19 3:00 ` [PATCH 4/5] ACPI, APEI, Fix error path for memory allocation Huang Ying
2010-09-21 12:45 ` Andi Kleen
2010-09-23 8:53 ` huang ying
2010-09-19 3:00 ` [PATCH 5/5] ACPI, APEI, Fix ERST MOVE_DATA instruction implementation Huang Ying
2010-09-21 12:47 ` Andi Kleen
2010-09-23 9:04 ` huang ying
2010-09-27 5:31 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284865235-29920-4-git-send-email-ying.huang@intel.com \
--to=ying.huang@intel.com \
--cc=andi@firstfloor.org \
--cc=jin.dongming@np.css.fujitsu.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox