coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-19 09:32:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: add missing sanitization tests

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-10 17:17:39 +00:00
parent 48f65abb01
commit 5f8fe4fdc3
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+13 -5
View File
@@ -432,6 +432,9 @@ static const struct commands command[] = {
*/ */
static size_t cmd_index = CMD_NULL; static size_t cmd_index = CMD_NULL;
typedef char assert_argc3[(ARGC_3==3)?1:-1];
typedef char assert_argc4[(ARGC_4==4)?1:-1];
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@@ -537,11 +540,6 @@ sanitize_command_index(size_t c)
check_command_num(c); check_command_num(c);
if (ARGC_3 != 3)
err(EINVAL, "ARGC_3 is not equal to 3");
if (ARGC_4 != 4)
err(EINVAL, "ARGC_4 is not equal to 4");
if (command[c].argc < 3) if (command[c].argc < 3)
err(EINVAL, "cmd index %lu: argc below 3, %d", err(EINVAL, "cmd index %lu: argc below 3, %d",
(unsigned long)c, command[c].argc); (unsigned long)c, command[c].argc);
@@ -559,6 +557,15 @@ sanitize_command_index(size_t c)
(unsigned long)c, command[c].str); (unsigned long)c, command[c].str);
} }
if (!((CMD_SETMAC > CMD_DUMP) && (CMD_SWAP > CMD_SETMAC) &&
(CMD_COPY > CMD_SWAP) && (CMD_CAT > CMD_COPY) &&
(CMD_CAT16 > CMD_CAT) && (CMD_CAT128 > CMD_CAT16)))
err(EINVAL, "Some command integers are the same");
if (!((SET_MOD_0 > SET_MOD_OFF) && (SET_MOD_1 > SET_MOD_0) &&
(SET_MOD_N > SET_MOD_1) && (SET_MOD_BOTH > SET_MOD_N)))
err(EINVAL, "Some modtype integers are the same");
mod_type = command[c].set_modified; mod_type = command[c].set_modified;
switch (mod_type) { switch (mod_type) {
case SET_MOD_0: case SET_MOD_0:
@@ -581,6 +588,7 @@ sanitize_command_index(size_t c)
CHECKSUM_READ, "CHECKSUM_READ"); CHECKSUM_READ, "CHECKSUM_READ");
check_enum_bin(SKIP_CHECKSUM_WRITE, "SKIP_CHECKSUM_WRITE", check_enum_bin(SKIP_CHECKSUM_WRITE, "SKIP_CHECKSUM_WRITE",
CHECKSUM_WRITE, "CHECKSUM_WRITE"); CHECKSUM_WRITE, "CHECKSUM_WRITE");
check_enum_bin(NO_INVERT, "NO_INVERT", PART_INVERT, "PART_INVERT");
gbe_rw_size = command[c].rw_size; gbe_rw_size = command[c].rw_size;