From: Jin Dongming <jin.dongming@np.css.fujitsu.com>
To: Huang Ying <ying.huang@intel.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Andi Kleen <andi@firstfloor.org>,
Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>,
ACPI <linux-acpi@vger.kernel.org>,
LKLM <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/4] [Patch-next] ACPI, APEI, HEST Fix the unsuitable usage of platform_data.
Date: Tue, 17 Aug 2010 09:58:13 +0900 [thread overview]
Message-ID: <4C69DEA5.1020902@np.css.fujitsu.com> (raw)
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 | 19 ++++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 385a605..b35c622 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..5a65e2a 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -137,20 +137,29 @@ 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;
+ void **platform_data;
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)
+
+ platform_data = kmalloc(sizeof(void *), GFP_KERNEL);
+ if (!platform_data)
+ return -ENOMEM;
+
+ *platform_data = hest_hdr;
+ if (!((struct acpi_hest_generic *)*platform_data)->enabled)
return 0;
+
ghes_dev = platform_device_alloc("GHES", hest_hdr->source_id);
- if (!ghes_dev)
+ if (!ghes_dev) {
+ kfree(platform_data);
return -ENOMEM;
- ghes_dev->dev.platform_data = generic;
+ }
+
+ ghes_dev->dev.platform_data = platform_data;
rc = platform_device_add(ghes_dev);
if (rc)
goto err;
--
1.7.1.1
next reply other threads:[~2010-08-17 0:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 0:58 Jin Dongming [this message]
2010-08-17 1:39 ` [PATCH 4/4] [Patch-next] ACPI, APEI, HEST Fix the unsuitable usage of platform_data Huang Ying
2010-08-17 3:00 ` Jin Dongming
2010-08-17 4:18 ` Huang Ying
2010-08-17 9:18 ` Jin Dongming
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=4C69DEA5.1020902@np.css.fujitsu.com \
--to=jin.dongming@np.css.fujitsu.com \
--cc=andi@firstfloor.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=seto.hidetoshi@jp.fujitsu.com \
--cc=sfr@canb.auug.org.au \
--cc=ying.huang@intel.com \
/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