GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/nvramtool: Bail out on unaligned multi-byte entries 

coreboot doesn't support CMOS options that are not byte aligned but
span multiple bytes. So treat them as error.

Change-Id: I2bcff62f153932e9c6646b4ce08e8da1c1532947
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/18246
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Nico Huber 2017-01-26 23:22:46 +01:00
parent 00b9f4c4b1
commit 3af6985050
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/nvramtool/accessors/layout-bin.c
View File

@ -481,6 +481,12 @@ static void try_add_cmos_table_entry(cmos_entry_t * cmos_entry)
*/
return;
case LAYOUT_MULTIBYTE_ENTRY_NOT_ALIGNED:
fprintf(stderr,
"%s: Unaligned CMOS option table entry %s "
"spans multiple bytes.\n", prog_name, cmos_entry->name);
break;
default:
BUG();
}

6
util/nvramtool/accessors/layout-text.c
View File

@ -695,6 +695,12 @@ static void try_add_layout_file_entry(const cmos_entry_t * cmos_entry)
*/
return;
case LAYOUT_MULTIBYTE_ENTRY_NOT_ALIGNED:
fprintf(stderr,
"%s: Unaligned CMOS option table entry %s "
"spans multiple bytes.\n", prog_name, cmos_entry->name);
break;
default:
BUG();
}

3
util/nvramtool/layout.c
View File

@ -169,6 +169,9 @@ int add_cmos_entry(const cmos_entry_t * e, const cmos_entry_t ** conflict)
if (e->length < 1)
return LAYOUT_ENTRY_BAD_LENGTH;
if (e->bit % 8 && e->bit / 8 != (e->bit + e->length - 1) / 8)
return LAYOUT_MULTIBYTE_ENTRY_NOT_ALIGNED;
if ((new_entry =
(cmos_entry_item_t *) malloc(sizeof(*new_entry))) == NULL)
out_of_memory();

1
util/nvramtool/layout.h
View File

@ -40,6 +40,7 @@
#define LAYOUT_CHECKSUM_OVERLAPS_SUMMED_AREA (LAYOUT_RESULT_START + 7)
#define LAYOUT_SUMMED_AREA_OUT_OF_RANGE (LAYOUT_RESULT_START + 8)
#define LAYOUT_CHECKSUM_LOCATION_OUT_OF_RANGE (LAYOUT_RESULT_START + 9)
#define LAYOUT_MULTIBYTE_ENTRY_NOT_ALIGNED (LAYOUT_RESULT_START + 10)
typedef enum {
CMOS_ENTRY_ENUM = 'e',