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

util/amdfwtool/amdfwtool.c: Verify it actually read bytes 

The function read() returns the number of bytes actually read. Program is
assuming it actually read the required number of bytes without checking.
This is wrong.

This fixes CIDs 1353019 and 1353021

BUG=b:72062481
TEST=Build no errors

Change-Id: I22d41b3de4eac5369f512f78b1b31cc1a250f787
Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-on: https://review.coreboot.org/23304
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Richard Spiegel 2018-01-17 10:23:19 -07:00 committed by Martin Roth
parent 1014de6858
commit 137484dee7
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
util/amdfwtool/amdfwtool.c
View File

@ -285,6 +285,7 @@ static uint32_t integrate_firmwares(char *base, uint32_t pos, uint32_t *romsig,
amd_fw_entry *fw_table, uint32_t rom_size) amd_fw_entry *fw_table, uint32_t rom_size)
{ {
int fd; int fd;
ssize_t bytes;
struct stat fd_stat; struct stat fd_stat;
int i; int i;
uint32_t rom_base_address = 0xFFFFFFFF - rom_size + 1; uint32_t rom_base_address = 0xFFFFFFFF - rom_size + 1;
@ -323,9 +324,17 @@ static uint32_t integrate_firmwares(char *base, uint32_t pos, uint32_t *romsig,
exit(1); exit(1);
} }
read(fd, (void *)(base + pos), (size_t)fd_stat.st_size); bytes = read(fd, (void *)(base + pos),
(size_t)fd_stat.st_size);
if (bytes == (ssize_t)fd_stat.st_size)
pos += fd_stat.st_size; pos += fd_stat.st_size;
else {
printf("Error while reading %s\n",
fw_table[i].filename);
free(base);
exit(1);
}
close(fd); close(fd);
pos = ALIGN(pos, 0x100U); pos = ALIGN(pos, 0x100U);
} }
@ -340,6 +349,7 @@ static uint32_t integrate_psp_firmwares(char *base, uint32_t pos,
uint32_t rom_size) uint32_t rom_size)
{ {
int fd; int fd;
ssize_t bytes;
struct stat fd_stat; struct stat fd_stat;
unsigned int i; unsigned int i;
uint32_t rom_base_address = 0xFFFFFFFF - rom_size + 1; uint32_t rom_base_address = 0xFFFFFFFF - rom_size + 1;
@ -373,9 +383,17 @@ static uint32_t integrate_psp_firmwares(char *base, uint32_t pos,
exit(1); exit(1);
} }
read(fd, (void *)(base + pos), (size_t)fd_stat.st_size); bytes = read(fd, (void *)(base + pos),
(size_t)fd_stat.st_size);
if (bytes == (ssize_t)fd_stat.st_size)
pos += fd_stat.st_size; pos += fd_stat.st_size;
else {
printf("Error while reading %s\n",
fw_table[i].filename);
free(base);
exit(1);
}
close(fd); close(fd);
pos = ALIGN(pos, 0x100U); pos = ALIGN(pos, 0x100U);
} else { } else {