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

amdfwtool: Pack out-of-bounds check into a function and move 

Need to check the FWs number limit several times. So pack the
duplicated steps into a function. And do it before access the new
entry.

Change-Id: I71117d1c817c0b6ddaea4ea47aea91672cc6d55a
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58764
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Zheng Bao 2021-10-30 12:09:07 +08:00 committed by Felix Held
parent 66f2cbb195
commit 5164e4b03f
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
util/amdfwtool/amdfwtool.c
View File

@ -354,6 +354,16 @@ typedef struct _context {
#define BUFF_TO_RUN(ctx, ptr) RUN_OFFSET((ctx), ((char *)(ptr) - (ctx).rom)) #define BUFF_TO_RUN(ctx, ptr) RUN_OFFSET((ctx), ((char *)(ptr) - (ctx).rom))
#define BUFF_ROOM(ctx) ((ctx).rom_size - (ctx).current) #define BUFF_ROOM(ctx) ((ctx).rom_size - (ctx).current)
void assert_fw_entry(uint32_t count, uint32_t max, context *ctx)
{
if (count >= max) {
fprintf(stderr, "Error: BIOS entries (%d) exceeds max allowed items "
"(%d)\n", count, max);
free(ctx->rom);
exit(1);
}
}
static void *new_psp_dir(context *ctx, int multi) static void *new_psp_dir(context *ctx, int multi)
{ {
void *ptr; void *ptr;
@ -653,6 +663,8 @@ static void integrate_psp_firmwares(context *ctx,
if (!(fw_table[i].level & level)) if (!(fw_table[i].level & level))
continue; continue;
assert_fw_entry(count, MAX_PSP_ENTRIES, ctx);
if (fw_table[i].type == AMD_TOKEN_UNLOCK) { if (fw_table[i].type == AMD_TOKEN_UNLOCK) {
if (!fw_table[i].other) if (!fw_table[i].other)
continue; continue;
@ -719,6 +731,7 @@ static void integrate_psp_firmwares(context *ctx,
} }
if (pspdir2) { if (pspdir2) {
assert_fw_entry(count, MAX_PSP_ENTRIES, ctx);
pspdir->entries[count].type = AMD_FW_L2_PTR; pspdir->entries[count].type = AMD_FW_L2_PTR;
pspdir->entries[count].subprog = 0; pspdir->entries[count].subprog = 0;
pspdir->entries[count].rsvd = 0; pspdir->entries[count].rsvd = 0;
@ -730,12 +743,6 @@ static void integrate_psp_firmwares(context *ctx,
count++; count++;
} }
if (count > MAX_PSP_ENTRIES) {
fprintf(stderr, "Error: PSP entries exceed max allowed items\n");
free(ctx->rom);
exit(1);
}
fill_dir_header(pspdir, count, cookie, ctx); fill_dir_header(pspdir, count, cookie, ctx);
} }
@ -888,6 +895,7 @@ static void integrate_bios_firmwares(context *ctx,
if (fw_table[i].type == AMD_BIOS_PSP_SHARED_MEM && if (fw_table[i].type == AMD_BIOS_PSP_SHARED_MEM &&
(!fw_table[i].dest || !fw_table[i].size)) (!fw_table[i].dest || !fw_table[i].size))
continue; continue;
assert_fw_entry(count, MAX_BIOS_ENTRIES, ctx);
biosdir->entries[count].type = fw_table[i].type; biosdir->entries[count].type = fw_table[i].type;
biosdir->entries[count].region_type = fw_table[i].region_type; biosdir->entries[count].region_type = fw_table[i].region_type;
@ -977,6 +985,7 @@ static void integrate_bios_firmwares(context *ctx,
} }
if (biosdir2) { if (biosdir2) {
assert_fw_entry(count, MAX_BIOS_ENTRIES, ctx);
biosdir->entries[count].type = AMD_BIOS_L2_PTR; biosdir->entries[count].type = AMD_BIOS_L2_PTR;
biosdir->entries[count].region_type = 0; biosdir->entries[count].region_type = 0;
biosdir->entries[count].size = biosdir->entries[count].size =
@ -994,13 +1003,6 @@ static void integrate_bios_firmwares(context *ctx,
count++; count++;
} }
if (count > MAX_BIOS_ENTRIES) {
fprintf(stderr, "Error: BIOS entries (%d) exceeds max allowed items "
"(%d)\n", count, MAX_BIOS_ENTRIES);
free(ctx->rom);
exit(1);
}
fill_dir_header(biosdir, count, cookie, ctx); fill_dir_header(biosdir, count, cookie, ctx);
} }