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

amdfwtool: Check the validation of EFS & body relative address 

We need to considering the case the EFS header is given as a relative
address and the other, body location, is given as an absolute one. So
we convert both of them to relative and check the validation.

For relative address case, the location should be between
0 and data size.

Change-Id: I7898bfbca02f5eb1c0fb7c456dc1935bddf685b1
Signed-off-by: Zheng Bao <fishbaozi@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73024
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
This commit is contained in:
Zheng Bao 2023-02-14 13:23:35 +08:00 committed by Fred Reitberger
parent da43c41f98
commit 9770df1e9d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/amdfwtool/amdfwtool.c
View File

@ -2404,10 +2404,20 @@ int main(int argc, char **argv)
printf(" AMDFWTOOL Using ROM size of %dKB\n", ctx.rom_size / 1024); printf(" AMDFWTOOL Using ROM size of %dKB\n", ctx.rom_size / 1024);
rom_base_address = 0xFFFFFFFF - ctx.rom_size + 1; rom_base_address = 0xFFFFFFFF - ctx.rom_size + 1;
if (efs_location && (efs_location < rom_base_address)) {
if (efs_location & 0xFF000000)
efs_location = efs_location - rom_base_address;
if (body_location & 0xFF000000)
body_location = body_location - rom_base_address;
if (efs_location && efs_location > ctx.rom_size) {
fprintf(stderr, "Error: EFS/Directory location outside of ROM.\n\n"); fprintf(stderr, "Error: EFS/Directory location outside of ROM.\n\n");
return 1; return 1;
} }
if (body_location && body_location > ctx.rom_size) {
fprintf(stderr, "Error: Body location outside of ROM.\n\n");
return 1;
}
if (!efs_location && body_location) { if (!efs_location && body_location) {
fprintf(stderr, "Error AMDFW body location specified without EFS location.\n"); fprintf(stderr, "Error AMDFW body location specified without EFS location.\n");
@ -2431,10 +2441,6 @@ int main(int argc, char **argv)
fprintf(stderr, " Require safe spacing of 256 bytes\n"); fprintf(stderr, " Require safe spacing of 256 bytes\n");
return 1; return 1;
} }
if (efs_location & 0xFF000000)
efs_location = efs_location - rom_base_address;
if (body_location & 0xFF000000)
body_location = body_location - rom_base_address;
if (any_location) { if (any_location) {
if ((body_location & 0x3f) || (efs_location & 0x3f)) { if ((body_location & 0x3f) || (efs_location & 0x3f)) {