lkml.org 
[lkml]   [2015]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [Patch v2] firmware: dmi_scan: fix dmi scan to handle "End of Table" structure
From
On 4 February 2015 at 14:22, Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> wrote:
> The dmi-sysfs should create "End of Table" entry, that is type 127.
> But after adding initial SMBIOS v3 support the 127-0 entry is not
> handled any more, as result it's not created in sysfs.
> This is important because the size of whole DMI table must correspond
> to sum of all DMI entry sizes.
>
> So move "end-of-table" check after it's handled by decode.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>

Reviewed-by: Ard Biesheuvel <ard@linaro.org>

> ---
>
> v2..v1:
> Move end of table check after it's handled instead of removing
> Correct commit
>
> drivers/firmware/dmi_scan.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
> index c5f7b4e..a44b87c 100644
> --- a/drivers/firmware/dmi_scan.c
> +++ b/drivers/firmware/dmi_scan.c
> @@ -93,12 +93,6 @@ static void dmi_table(u8 *buf, int len, int num,
> const struct dmi_header *dm = (const struct dmi_header *)data;
>
> /*
> - * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0]
> - */
> - if (dm->type == DMI_ENTRY_END_OF_TABLE)
> - break;
> -
> - /*
> * We want to know the total length (formatted area and
> * strings) before decoding to make sure we won't run off the
> * table in dmi_decode or dmi_string
> @@ -108,6 +102,13 @@ static void dmi_table(u8 *buf, int len, int num,
> data++;
> if (data - buf < len - 1)
> decode(dm, private_data);
> +
> + /*
> + * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0]
> + */
> + if (dm->type == DMI_ENTRY_END_OF_TABLE)
> + break;
> +
> data += 2;
> i++;
> }
> --
> 1.9.1
>


\
 
 \ /
  Last update: 2015-02-05 12:01    [W:0.120 / U:0.972 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site