diff options
| author | Leah Rowe <leah@libreboot.org> | 2026-03-02 17:35:00 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2026-03-02 17:35:00 +0000 |
| commit | a34e79f501bbd81c4ee110cdee89d4fb528b8231 (patch) | |
| tree | 30d35f63befcd245592ecf2b2656d4ca8973ac0c | |
| parent | 4e7d48b5c54a3a9132dfa04ab783688322ec87a9 (diff) | |
util/nvmutil: add boundary checks on word/setWord
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>
| -rw-r--r-- | util/nvmutil/nvmutil.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index 84b44aa6..3b71e165 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -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), openFiles(const char *path), cmd_copy(void), writeGbe_part(int), 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); uint8_t hextonum(char chs), rhex(void); uint16_t word(int, int); @@ -405,12 +405,14 @@ goodChecksum(int partnum) uint16_t word(int pos16, int p) { + check_bounds(pos16, p); return ((uint16_t *) gbe[p])[pos16]; } void setWord(int pos16, int p, uint16_t val16) { + check_bounds(pos16, p); if (((uint16_t *) gbe[p])[pos16] != val16) { nvmPartChanged[p] = 1; ((uint16_t *) gbe[p])[pos16] = val16; @@ -418,6 +420,15 @@ setWord(int pos16, int p, uint16_t 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 writeGbe(void) { for (int p = 0; p < 2; p++) |