* [PATCH] acpi: fix apei related table size checking
@ 2010-07-23 17:39 Yinghai Lu
2010-07-26 4:23 ` Bjorn Helgaas
2010-07-26 7:41 ` Huang Ying
0 siblings, 2 replies; 9+ messages in thread
From: Yinghai Lu @ 2010-07-23 17:39 UTC (permalink / raw)
To: Len Brown, Huang Ying, Andi Kleen
Cc: Stephen Rothwell, Tejun Heo, Daniel J Blueman, linux-acpi,
linux-kernel
also check if we can find right action in apei.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/acpi/apei/apei-base.c | 5 +++++
drivers/acpi/apei/einj.c | 3 ++-
drivers/acpi/apei/erst.c | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
Index: linux-2.6/drivers/acpi/apei/einj.c
===================================================================
--- linux-2.6.orig/drivers/acpi/apei/einj.c
+++ linux-2.6/drivers/acpi/apei/einj.c
@@ -426,7 +426,8 @@ DEFINE_SIMPLE_ATTRIBUTE(error_inject_fop
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;
Index: linux-2.6/drivers/acpi/apei/erst.c
===================================================================
--- linux-2.6.orig/drivers/acpi/apei/erst.c
+++ linux-2.6/drivers/acpi/apei/erst.c
@@ -749,7 +749,8 @@ __setup("erst_disable", setup_erst_disab
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;
Index: linux-2.6/drivers/acpi/apei/apei-base.c
===================================================================
--- linux-2.6.orig/drivers/acpi/apei/apei-base.c
+++ linux-2.6/drivers/acpi/apei/apei-base.c
@@ -163,6 +163,7 @@ int apei_exec_run(struct apei_exec_conte
u32 i, ip;
struct acpi_whea_header *entry;
apei_exec_ins_func_t run;
+ bool found_action = false;
ctx->ip = 0;
@@ -178,6 +179,7 @@ rewind:
entry = &ctx->action_table[i];
if (entry->action != action)
continue;
+ found_action = true;
if (ip == ctx->ip) {
if (entry->instruction >= ctx->instructions ||
!ctx->ins_table[entry->instruction].run) {
@@ -198,6 +200,9 @@ rewind:
goto rewind;
}
+ if (!found_action)
+ return -ENODEV;
+
return 0;
}
EXPORT_SYMBOL_GPL(apei_exec_run);
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] acpi: fix apei related table size checking
2010-07-23 17:39 [PATCH] acpi: fix apei related table size checking Yinghai Lu
@ 2010-07-26 4:23 ` Bjorn Helgaas
2010-07-26 7:13 ` Andi Kleen
2010-07-26 7:41 ` Huang Ying
1 sibling, 1 reply; 9+ messages in thread
From: Bjorn Helgaas @ 2010-07-26 4:23 UTC (permalink / raw)
To: Yinghai Lu
Cc: Len Brown, Huang Ying, Andi Kleen, Stephen Rothwell, Tejun Heo,
Daniel J Blueman, linux-acpi, linux-kernel
On Friday, July 23, 2010 11:39:17 am Yinghai Lu wrote:
>
> also check if we can find right action in apei.
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
This should be split into two patches that each fix one thing.
> ---
> drivers/acpi/apei/apei-base.c | 5 +++++
> drivers/acpi/apei/einj.c | 3 ++-
> drivers/acpi/apei/erst.c | 3 ++-
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> Index: linux-2.6/drivers/acpi/apei/einj.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/apei/einj.c
> +++ linux-2.6/drivers/acpi/apei/einj.c
> @@ -426,7 +426,8 @@ DEFINE_SIMPLE_ATTRIBUTE(error_inject_fop
>
> 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;
> Index: linux-2.6/drivers/acpi/apei/erst.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/apei/erst.c
> +++ linux-2.6/drivers/acpi/apei/erst.c
> @@ -749,7 +749,8 @@ __setup("erst_disable", setup_erst_disab
>
> 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;
> Index: linux-2.6/drivers/acpi/apei/apei-base.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/apei/apei-base.c
> +++ linux-2.6/drivers/acpi/apei/apei-base.c
> @@ -163,6 +163,7 @@ int apei_exec_run(struct apei_exec_conte
> u32 i, ip;
> struct acpi_whea_header *entry;
> apei_exec_ins_func_t run;
> + bool found_action = false;
>
> ctx->ip = 0;
>
> @@ -178,6 +179,7 @@ rewind:
> entry = &ctx->action_table[i];
> if (entry->action != action)
> continue;
> + found_action = true;
> if (ip == ctx->ip) {
> if (entry->instruction >= ctx->instructions ||
> !ctx->ins_table[entry->instruction].run) {
> @@ -198,6 +200,9 @@ rewind:
> goto rewind;
> }
>
> + if (!found_action)
> + return -ENODEV;
> +
> return 0;
> }
> EXPORT_SYMBOL_GPL(apei_exec_run);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] acpi: fix apei related table size checking
2010-07-26 4:23 ` Bjorn Helgaas
@ 2010-07-26 7:13 ` Andi Kleen
0 siblings, 0 replies; 9+ messages in thread
From: Andi Kleen @ 2010-07-26 7:13 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Yinghai Lu, Len Brown, Huang Ying, Stephen Rothwell, Tejun Heo,
Daniel J Blueman, linux-acpi, linux-kernel
On 7/26/2010 6:23 AM, Bjorn Helgaas wrote:
> On Friday, July 23, 2010 11:39:17 am Yinghai Lu wrote:
>> also check if we can find right action in apei.
>>
>> Signed-off-by: Yinghai Lu<yinghai@kernel.org>
> This should be split into two patches that each fix one thing.
... and the description actually describe what it is supposed to fix.
-Andi
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] acpi: fix apei related table size checking
2010-07-23 17:39 [PATCH] acpi: fix apei related table size checking Yinghai Lu
2010-07-26 4:23 ` Bjorn Helgaas
@ 2010-07-26 7:41 ` Huang Ying
1 sibling, 0 replies; 9+ messages in thread
From: Huang Ying @ 2010-07-26 7:41 UTC (permalink / raw)
To: Yinghai Lu
Cc: Len Brown, Andi Kleen, Stephen Rothwell, Tejun Heo,
Daniel J Blueman, linux-acpi@vger.kernel.org,
linux-kernel@vger.kernel.org
On Sat, 2010-07-24 at 01:39 +0800, Yinghai Lu wrote:
> also check if we can find right action in apei.
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
>
> ---
> drivers/acpi/apei/apei-base.c | 5 +++++
> drivers/acpi/apei/einj.c | 3 ++-
> drivers/acpi/apei/erst.c | 3 ++-
> 3 files changed, 9 insertions(+), 2 deletions(-)
>
> Index: linux-2.6/drivers/acpi/apei/einj.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/apei/einj.c
> +++ linux-2.6/drivers/acpi/apei/einj.c
> @@ -426,7 +426,8 @@ DEFINE_SIMPLE_ATTRIBUTE(error_inject_fop
>
> 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;
It seems that the header_length field is not set properly by BIOS on my
testing machine which I used to develop the original code. Will try to
contact BIOS guys to make sure.
> Index: linux-2.6/drivers/acpi/apei/apei-base.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/apei/apei-base.c
> +++ linux-2.6/drivers/acpi/apei/apei-base.c
> @@ -163,6 +163,7 @@ int apei_exec_run(struct apei_exec_conte
> u32 i, ip;
> struct acpi_whea_header *entry;
> apei_exec_ins_func_t run;
> + bool found_action = false;
>
> ctx->ip = 0;
>
> @@ -178,6 +179,7 @@ rewind:
> entry = &ctx->action_table[i];
> if (entry->action != action)
> continue;
> + found_action = true;
> if (ip == ctx->ip) {
> if (entry->instruction >= ctx->instructions ||
> !ctx->ins_table[entry->instruction].run) {
> @@ -198,6 +200,9 @@ rewind:
> goto rewind;
> }
>
> + if (!found_action)
> + return -ENODEV;
-ENOENT is better here?
Best Regards,
Huang Ying
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] ACPI: fix APEI related table size checking
@ 2012-10-16 14:46 Jan Beulich
2012-10-16 15:12 ` Keir Fraser
2012-10-17 6:49 ` Huang Ying
0 siblings, 2 replies; 9+ messages in thread
From: Jan Beulich @ 2012-10-16 14:46 UTC (permalink / raw)
To: xen-devel; +Cc: ying.huang
[-- Attachment #1: Type: text/plain, Size: 1817 bytes --]
On Huang Ying's machine:
erst_tab->header_length == sizeof(struct acpi_table_einj)
but Yinghai reported that on his machine,
erst_tab->header_length == sizeof(struct acpi_table_einj) -
sizeof(struct acpi_table_header)
To make erst table size checking code works on all systems, both
testing are treated as PASS.
Same situation applies to einj_tab->header_length, so corresponding
table size checking is changed in similar way too.
Originally-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Huang Ying <ying.huang@intel.com>
- use switch() for better readability
- add comment explaining why a formally invalid size it also being
accepted
- check erst_tab->header.length before even looking at
erst_tab->header_length
- prefer sizeof(*erst_tab) over sizeof(struct acpi_table_erst)
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/drivers/acpi/apei/erst.c
+++ b/xen/drivers/acpi/apei/erst.c
@@ -715,12 +715,23 @@ int erst_clear(u64 record_id)
static int __init 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(*erst_tab))
return -EINVAL;
- if (erst_tab->header.length < sizeof(struct acpi_table_erst))
+
+ switch (erst_tab->header_length) {
+ case sizeof(*erst_tab) - sizeof(erst_tab->header):
+ /*
+ * While invalid per specification, there are (early?) systems
+ * indicating the full header size here, so accept that value too.
+ */
+ case sizeof(*erst_tab):
+ break;
+ default:
return -EINVAL;
+ }
+
if (erst_tab->entries !=
- (erst_tab->header.length - sizeof(struct acpi_table_erst)) /
+ (erst_tab->header.length - sizeof(*erst_tab)) /
sizeof(struct acpi_erst_entry))
return -EINVAL;
[-- Attachment #2: ACPI-ERST-header-length.patch --]
[-- Type: text/plain, Size: 1857 bytes --]
ACPI: fix APEI related table size checking
On Huang Ying's machine:
erst_tab->header_length == sizeof(struct acpi_table_einj)
but Yinghai reported that on his machine,
erst_tab->header_length == sizeof(struct acpi_table_einj) -
sizeof(struct acpi_table_header)
To make erst table size checking code works on all systems, both
testing are treated as PASS.
Same situation applies to einj_tab->header_length, so corresponding
table size checking is changed in similar way too.
Originally-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Huang Ying <ying.huang@intel.com>
- use switch() for better readability
- add comment explaining why a formally invalid size it also being
accepted
- check erst_tab->header.length before even looking at
erst_tab->header_length
- prefer sizeof(*erst_tab) over sizeof(struct acpi_table_erst)
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/drivers/acpi/apei/erst.c
+++ b/xen/drivers/acpi/apei/erst.c
@@ -715,12 +715,23 @@ int erst_clear(u64 record_id)
static int __init 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(*erst_tab))
return -EINVAL;
- if (erst_tab->header.length < sizeof(struct acpi_table_erst))
+
+ switch (erst_tab->header_length) {
+ case sizeof(*erst_tab) - sizeof(erst_tab->header):
+ /*
+ * While invalid per specification, there are (early?) systems
+ * indicating the full header size here, so accept that value too.
+ */
+ case sizeof(*erst_tab):
+ break;
+ default:
return -EINVAL;
+ }
+
if (erst_tab->entries !=
- (erst_tab->header.length - sizeof(struct acpi_table_erst)) /
+ (erst_tab->header.length - sizeof(*erst_tab)) /
sizeof(struct acpi_erst_entry))
return -EINVAL;
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] ACPI: fix APEI related table size checking
2012-10-16 14:46 [PATCH] ACPI: fix APEI " Jan Beulich
@ 2012-10-16 15:12 ` Keir Fraser
2012-10-17 6:49 ` Huang Ying
1 sibling, 0 replies; 9+ messages in thread
From: Keir Fraser @ 2012-10-16 15:12 UTC (permalink / raw)
To: Jan Beulich, xen-devel; +Cc: ying.huang
On 16/10/2012 15:46, "Jan Beulich" <JBeulich@suse.com> wrote:
> On Huang Ying's machine:
>
> erst_tab->header_length == sizeof(struct acpi_table_einj)
>
> but Yinghai reported that on his machine,
>
> erst_tab->header_length == sizeof(struct acpi_table_einj) -
> sizeof(struct acpi_table_header)
>
> To make erst table size checking code works on all systems, both
> testing are treated as PASS.
>
> Same situation applies to einj_tab->header_length, so corresponding
> table size checking is changed in similar way too.
>
> Originally-by: Yinghai Lu <yinghai@kernel.org>
> Signed-off-by: Huang Ying <ying.huang@intel.com>
>
> - use switch() for better readability
> - add comment explaining why a formally invalid size it also being
> accepted
> - check erst_tab->header.length before even looking at
> erst_tab->header_length
> - prefer sizeof(*erst_tab) over sizeof(struct acpi_table_erst)
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
> --- a/xen/drivers/acpi/apei/erst.c
> +++ b/xen/drivers/acpi/apei/erst.c
> @@ -715,12 +715,23 @@ int erst_clear(u64 record_id)
>
> static int __init 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(*erst_tab))
> return -EINVAL;
> - if (erst_tab->header.length < sizeof(struct acpi_table_erst))
> +
> + switch (erst_tab->header_length) {
> + case sizeof(*erst_tab) - sizeof(erst_tab->header):
> + /*
> + * While invalid per specification, there are (early?) systems
> + * indicating the full header size here, so accept that value too.
> + */
> + case sizeof(*erst_tab):
> + break;
> + default:
> return -EINVAL;
> + }
> +
> if (erst_tab->entries !=
> - (erst_tab->header.length - sizeof(struct acpi_table_erst)) /
> + (erst_tab->header.length - sizeof(*erst_tab)) /
> sizeof(struct acpi_erst_entry))
> return -EINVAL;
>
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] ACPI: fix APEI related table size checking
2012-10-16 14:46 [PATCH] ACPI: fix APEI " Jan Beulich
2012-10-16 15:12 ` Keir Fraser
@ 2012-10-17 6:49 ` Huang Ying
2012-10-17 6:56 ` Jan Beulich
1 sibling, 1 reply; 9+ messages in thread
From: Huang Ying @ 2012-10-17 6:49 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel
On Tue, 2012-10-16 at 15:46 +0100, Jan Beulich wrote:
> On Huang Ying's machine:
>
> erst_tab->header_length == sizeof(struct acpi_table_einj)
~~~~ ~~~~
Typo?
Best Regards,
Huang Ying
> but Yinghai reported that on his machine,
>
> erst_tab->header_length == sizeof(struct acpi_table_einj) -
> sizeof(struct acpi_table_header)
>
> To make erst table size checking code works on all systems, both
> testing are treated as PASS.
>
> Same situation applies to einj_tab->header_length, so corresponding
> table size checking is changed in similar way too.
>
> Originally-by: Yinghai Lu <yinghai@kernel.org>
> Signed-off-by: Huang Ying <ying.huang@intel.com>
>
> - use switch() for better readability
> - add comment explaining why a formally invalid size it also being
> accepted
> - check erst_tab->header.length before even looking at
> erst_tab->header_length
> - prefer sizeof(*erst_tab) over sizeof(struct acpi_table_erst)
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
>
> --- a/xen/drivers/acpi/apei/erst.c
> +++ b/xen/drivers/acpi/apei/erst.c
> @@ -715,12 +715,23 @@ int erst_clear(u64 record_id)
>
> static int __init 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(*erst_tab))
> return -EINVAL;
> - if (erst_tab->header.length < sizeof(struct acpi_table_erst))
> +
> + switch (erst_tab->header_length) {
> + case sizeof(*erst_tab) - sizeof(erst_tab->header):
> + /*
> + * While invalid per specification, there are (early?) systems
> + * indicating the full header size here, so accept that value too.
> + */
> + case sizeof(*erst_tab):
> + break;
> + default:
> return -EINVAL;
> + }
> +
> if (erst_tab->entries !=
> - (erst_tab->header.length - sizeof(struct acpi_table_erst)) /
> + (erst_tab->header.length - sizeof(*erst_tab)) /
> sizeof(struct acpi_erst_entry))
> return -EINVAL;
>
>
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] ACPI: fix APEI related table size checking
2012-10-17 6:49 ` Huang Ying
@ 2012-10-17 6:56 ` Jan Beulich
2012-10-17 8:52 ` Huang Ying
0 siblings, 1 reply; 9+ messages in thread
From: Jan Beulich @ 2012-10-17 6:56 UTC (permalink / raw)
To: Huang Ying; +Cc: xen-devel
>>> On 17.10.12 at 08:49, Huang Ying <ying.huang@intel.com> wrote:
> On Tue, 2012-10-16 at 15:46 +0100, Jan Beulich wrote:
>> On Huang Ying's machine:
>>
>> erst_tab->header_length == sizeof(struct acpi_table_einj)
> ~~~~ ~~~~
>
> Typo?
Your typo: I copied the Linux commit message verbatim, to make
it possible to match the two commits. The adjustments done in
the actual patch eliminate the copy-n-paste mistake corrected by
Linux commit 7ed28f2ed43ece424ff2fa4dedac7928bb37a23a.
Jan
>> but Yinghai reported that on his machine,
>>
>> erst_tab->header_length == sizeof(struct acpi_table_einj) -
>> sizeof(struct acpi_table_header)
>>
>> To make erst table size checking code works on all systems, both
>> testing are treated as PASS.
>>
>> Same situation applies to einj_tab->header_length, so corresponding
>> table size checking is changed in similar way too.
>>
>> Originally-by: Yinghai Lu <yinghai@kernel.org>
>> Signed-off-by: Huang Ying <ying.huang@intel.com>
>>
>> - use switch() for better readability
>> - add comment explaining why a formally invalid size it also being
>> accepted
>> - check erst_tab->header.length before even looking at
>> erst_tab->header_length
>> - prefer sizeof(*erst_tab) over sizeof(struct acpi_table_erst)
>>
>> Signed-off-by: Jan Beulich <jbeulich@suse.com>
>>
>> --- a/xen/drivers/acpi/apei/erst.c
>> +++ b/xen/drivers/acpi/apei/erst.c
>> @@ -715,12 +715,23 @@ int erst_clear(u64 record_id)
>>
>> static int __init 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(*erst_tab))
>> return -EINVAL;
>> - if (erst_tab->header.length < sizeof(struct acpi_table_erst))
>> +
>> + switch (erst_tab->header_length) {
>> + case sizeof(*erst_tab) - sizeof(erst_tab->header):
>> + /*
>> + * While invalid per specification, there are (early?) systems
>> + * indicating the full header size here, so accept that value too.
>> + */
>> + case sizeof(*erst_tab):
>> + break;
>> + default:
>> return -EINVAL;
>> + }
>> +
>> if (erst_tab->entries !=
>> - (erst_tab->header.length - sizeof(struct acpi_table_erst)) /
>> + (erst_tab->header.length - sizeof(*erst_tab)) /
>> sizeof(struct acpi_erst_entry))
>> return -EINVAL;
>>
>>
>>
>>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] ACPI: fix APEI related table size checking
2012-10-17 6:56 ` Jan Beulich
@ 2012-10-17 8:52 ` Huang Ying
0 siblings, 0 replies; 9+ messages in thread
From: Huang Ying @ 2012-10-17 8:52 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel
On Wed, 2012-10-17 at 07:56 +0100, Jan Beulich wrote:
> >>> On 17.10.12 at 08:49, Huang Ying <ying.huang@intel.com> wrote:
> > On Tue, 2012-10-16 at 15:46 +0100, Jan Beulich wrote:
> >> On Huang Ying's machine:
> >>
> >> erst_tab->header_length == sizeof(struct acpi_table_einj)
> > ~~~~ ~~~~
> >
> > Typo?
>
> Your typo: I copied the Linux commit message verbatim, to make
> it possible to match the two commits. The adjustments done in
> the actual patch eliminate the copy-n-paste mistake corrected by
> Linux commit 7ed28f2ed43ece424ff2fa4dedac7928bb37a23a.
Sorry, my bad.
Best Regards,
Huang Ying
>
> >> but Yinghai reported that on his machine,
> >>
> >> erst_tab->header_length == sizeof(struct acpi_table_einj) -
> >> sizeof(struct acpi_table_header)
> >>
> >> To make erst table size checking code works on all systems, both
> >> testing are treated as PASS.
> >>
> >> Same situation applies to einj_tab->header_length, so corresponding
> >> table size checking is changed in similar way too.
> >>
> >> Originally-by: Yinghai Lu <yinghai@kernel.org>
> >> Signed-off-by: Huang Ying <ying.huang@intel.com>
> >>
> >> - use switch() for better readability
> >> - add comment explaining why a formally invalid size it also being
> >> accepted
> >> - check erst_tab->header.length before even looking at
> >> erst_tab->header_length
> >> - prefer sizeof(*erst_tab) over sizeof(struct acpi_table_erst)
> >>
> >> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> >>
> >> --- a/xen/drivers/acpi/apei/erst.c
> >> +++ b/xen/drivers/acpi/apei/erst.c
> >> @@ -715,12 +715,23 @@ int erst_clear(u64 record_id)
> >>
> >> static int __init 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(*erst_tab))
> >> return -EINVAL;
> >> - if (erst_tab->header.length < sizeof(struct acpi_table_erst))
> >> +
> >> + switch (erst_tab->header_length) {
> >> + case sizeof(*erst_tab) - sizeof(erst_tab->header):
> >> + /*
> >> + * While invalid per specification, there are (early?) systems
> >> + * indicating the full header size here, so accept that value too.
> >> + */
> >> + case sizeof(*erst_tab):
> >> + break;
> >> + default:
> >> return -EINVAL;
> >> + }
> >> +
> >> if (erst_tab->entries !=
> >> - (erst_tab->header.length - sizeof(struct acpi_table_erst)) /
> >> + (erst_tab->header.length - sizeof(*erst_tab)) /
> >> sizeof(struct acpi_erst_entry))
> >> return -EINVAL;
> >>
> >>
> >>
> >>
>
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-10-17 8:52 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-23 17:39 [PATCH] acpi: fix apei related table size checking Yinghai Lu
2010-07-26 4:23 ` Bjorn Helgaas
2010-07-26 7:13 ` Andi Kleen
2010-07-26 7:41 ` Huang Ying
-- strict thread matches above, loose matches on Subject: below --
2012-10-16 14:46 [PATCH] ACPI: fix APEI " Jan Beulich
2012-10-16 15:12 ` Keir Fraser
2012-10-17 6:49 ` Huang Ying
2012-10-17 6:56 ` Jan Beulich
2012-10-17 8:52 ` Huang Ying
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.