coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-15 17:58:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: add boundary checks on word/setWord

Browse Source 
this was the other complication with doing it as a macro.

for something this fundamental, we really want to ensure
that every access is safe.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-02 17:35:00 +00:00
parent 4e7d48b5c5
commit a34e79f501
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+12 -1
View File
@@ -20,7 +20,7 @@ void cmd_setchecksum(void), cmd_brick(void), swap(int partnum), writeGbe(void),
parseMacString(const char *strMac, uint16_t *mac), cmd_swap(void), parseMacString(const char *strMac, uint16_t *mac), cmd_swap(void),
openFiles(const char *path), cmd_copy(void), writeGbe_part(int), openFiles(const char *path), cmd_copy(void), writeGbe_part(int),
readGbe_part(int), usage(char*), set_io_flags(int, char **), readGbe_part(int), usage(char*), set_io_flags(int, char **),
set_cmd(int, char **), setWord(int, int, uint16_t); set_cmd(int, char **), setWord(int, int, uint16_t), check_bounds(int, int);
int goodChecksum(int partnum); int goodChecksum(int partnum);
uint8_t hextonum(char chs), rhex(void); uint8_t hextonum(char chs), rhex(void);
uint16_t word(int, int); uint16_t word(int, int);
@@ -405,18 +405,29 @@ goodChecksum(int partnum)
uint16_t uint16_t
word(int pos16, int p) word(int pos16, int p)
{ {
check_bounds(pos16, p);
return ((uint16_t *) gbe[p])[pos16]; return ((uint16_t *) gbe[p])[pos16];
} }
void void
setWord(int pos16, int p, uint16_t val16) setWord(int pos16, int p, uint16_t val16)
{ {
check_bounds(pos16, p);
if (((uint16_t *) gbe[p])[pos16] != val16) { if (((uint16_t *) gbe[p])[pos16] != val16) {
nvmPartChanged[p] = 1; nvmPartChanged[p] = 1;
((uint16_t *) gbe[p])[pos16] = val16; ((uint16_t *) gbe[p])[pos16] = val16;
} }
} }
void
check_bounds(int c, int p)
{
if ((p != 0) && (p != 1))
err(SET_ERR(EINVAL), "check_bounds: invalid partnum %d", p);
if ((c < 0) || (c > nf))
err(SET_ERR(EINVAL), "check_bounds: out of bounds %d", c);
}
void void
writeGbe(void) writeGbe(void)
{ {