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, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 1/5] ACPI, APEI, Fix APEI related table size checking
Date: Sun, 19 Sep 2010 11:00:31 +0800 [thread overview]
Message-ID: <1284865235-29920-2-git-send-email-ying.huang@intel.com> (raw)
In-Reply-To: <1284865235-29920-1-git-send-email-ying.huang@intel.com>
From: Yinghai Lu <yinghai@kernel.org>
Both ERST and EINJ table size checking is fixed.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Huang Ying <ying.huang@intel.com>
---
drivers/acpi/apei/einj.c | 3 ++-
drivers/acpi/apei/erst.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 465c885..b184baa 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -426,7 +426,8 @@ DEFINE_SIMPLE_ATTRIBUTE(error_inject_fops, NULL,
static int einj_check_table(struct acpi_table_einj *einj_tab)
{
- if (einj_tab->header_length != sizeof(struct acpi_table_einj))
+ if (einj_tab->header_length !=
+ (sizeof(struct acpi_table_einj) - sizeof(einj_tab->header)))
return -EINVAL;
if (einj_tab->header.length < sizeof(struct acpi_table_einj))
return -EINVAL;
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index a4904f1..40b01c3 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -750,7 +750,8 @@ __setup("erst_disable", setup_erst_disable);
static int erst_check_table(struct acpi_table_erst *erst_tab)
{
- if (erst_tab->header_length != sizeof(struct acpi_table_erst))
+ if (erst_tab->header_length !=
+ (sizeof(struct acpi_table_erst) - sizeof(erst_tab->header)))
return -EINVAL;
if (erst_tab->header.length < sizeof(struct acpi_table_erst))
return -EINVAL;
--
1.7.1
next prev parent reply other threads:[~2010-09-19 3:01 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 ` Huang Ying [this message]
2010-09-21 12:39 ` [PATCH 1/5] ACPI, APEI, Fix APEI related table size checking 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 ` [PATCH 3/5] ACPI, APEI, HEST Fix the unsuitable usage of platform_data Huang Ying
2010-09-21 12:43 ` 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-2-git-send-email-ying.huang@intel.com \
--to=ying.huang@intel.com \
--cc=andi@firstfloor.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=yinghai@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