coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-18 14:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: sanitize the command list

Browse Source 
this is a guard against mistakes by future maintainers

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-08 04:46:49 +00:00
parent 8ce1cbe7f4
commit a7f97f385c
1 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+57 -4
View File
@@ -27,10 +27,13 @@
#endif #endif
#endif #endif
static void sanitize_command_list(void);
static void sanitize_command(size_t c);
static void set_cmd(int argc, char *argv[]); static void set_cmd(int argc, char *argv[]);
static void set_cmd_args(int argc, char *argv[]); static void set_cmd_args(int argc, char *argv[]);
static size_t conv_argv_part_num(const char *part_str); static size_t conv_argv_part_num(const char *part_str);
static void run_cmd(size_t c); static void run_cmd(size_t c);
static void check_command_num(size_t c);
static void set_io_flags(int argc, char *argv[]); static void set_io_flags(int argc, char *argv[]);
static void open_gbe_file(void); static void open_gbe_file(void);
#ifndef HAVE_ARC4RANDOM_BUF #ifndef HAVE_ARC4RANDOM_BUF
@@ -190,6 +193,8 @@ static const struct commands command[] = {
ARGC_4, NO_INVERT }, ARGC_4, NO_INVERT },
}; };
#define MAX_CMD_LEN 50
/* /*
* Index in command[], will be set later * Index in command[], will be set later
*/ */
@@ -223,6 +228,8 @@ main(int argc, char *argv[])
err(ECANCELED, "unveil '/dev/null'"); err(ECANCELED, "unveil '/dev/null'");
#endif #endif
sanitize_command_list();
set_cmd(argc, argv); set_cmd(argc, argv);
set_cmd_args(argc, argv); set_cmd_args(argc, argv);
set_io_flags(argc, argv); set_io_flags(argc, argv);
@@ -296,6 +303,47 @@ main(int argc, char *argv[])
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
/*
* Guard against regressions by maintainers (command table)
*/
static void
sanitize_command_list(void)
{
size_t c;
for (c = 0; c < items(command); c++) {
sanitize_command(c);
}
}
static void
sanitize_command(size_t c)
{
check_command_num(c);
if (command[c].argc < 2)
err(ECANCELED, "cmd index %zu: argc below 2, %d",
c, command[c].argc);
if (command[c].str == NULL)
err(ECANCELED, "cmd index %zu: NULL str", c);
if (*command[c].str == '\0')
err(ECANCELED, "cmd index %zu: empty str", c);
if (strnlen(command[c].str, MAX_CMD_LEN + 1) >
MAX_CMD_LEN) {
err(ECANCELED, "cmd index %zu: str too long: %s",
c, command[c].str);
}
if (command[c].run == NULL)
err(ECANCELED, "cmd index %zu: NULL ptr(run)", c);
if (command[c].invert > 1)
err(ECANCELED, "cmd index %zu: invert above 1", c);
}
static void static void
set_cmd(int argc, char *argv[]) set_cmd(int argc, char *argv[])
{ {
@@ -384,15 +432,20 @@ conv_argv_part_num(const char *part_str)
static void static void
run_cmd(size_t c) run_cmd(size_t c)
{
check_command_num(c);
command[c].run();
}
static void
check_command_num(size_t c)
{ {
if (c >= items(command)) if (c >= items(command))
err(ECANCELED, "run_cmd: Invalid run_cmd arg: %zu", c); err(ECANCELED, "Invalid run_cmd arg: %zu", c);
if (c != command[c].chk) if (c != command[c].chk)
err(ECANCELED, "run_cmd: Invalid chk value (%zu) vs arg: %zu", err(ECANCELED, "Invalid cmd chk value (%zu) vs arg: %zu",
command[c].chk, c); command[c].chk, c);
command[c].run();
} }
static void static void