diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-06-01 14:04:44 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-06-01 14:04:44 +0100 |
| commit | 99258a38ae98ed9465fa1d149b1e5bdb18f8ca3c (patch) | |
| tree | 53823d1c86a08143f4c1ac839d2a96d975083726 | |
| parent | 69fa333e25c070689b707e261b31b08be82d9fc4 (diff) | |
util/nvmutil: code cleanup (pledge/unveil calls)
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | util/nvmutil/nvmutil.c | 13 | ||||
| -rw-r--r-- | util/nvmutil/nvmutil.h | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index e8abe516..1e2b2b56 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -18,7 +18,6 @@ main(int argc, char *argv[]) if (argc == 3) { if (strcmp(COMMAND, "dump") == 0) { - xpledge("stdio", NULL); cmd = &cmd_dump; } else if (strcmp(COMMAND, "setmac") == 0) { strMac = (char *) strRMac; /* random mac address */ @@ -41,7 +40,6 @@ main(int argc, char *argv[]) nf = SIZE_4KB; } } - err_if((errno = ((strMac == NULL) && (cmd == NULL)) ? EINVAL : errno)); skipread[part ^ 1] = (cmd == &cmd_copy) | (cmd == &cmd_setchecksum) @@ -61,10 +59,11 @@ main(int argc, char *argv[]) void openFiles(const char *path) { - (void)rhex(); + struct stat st; xopen(fd, path, flags); if ((st.st_size != SIZE_8KB)) err(errno = ECANCELED, "File `%s` not 8KiB", path); + xopen(rfd, "/dev/urandom", O_RDONLY); errno = errno != ENOTDIR ? errno : 0; xunveil("/dev/urandom", "r"); if (flags != O_RDONLY) { @@ -145,14 +144,10 @@ hextonum(char ch) uint8_t rhex(void) { - static int rfd = -1, n = 0; + static int n = 0; static uint8_t rnum[16]; - if (!n) { - if (rfd == -1) { - xopen(rfd, "/dev/urandom", O_RDONLY); - } + if (!n) xpread(rfd, (uint8_t *) &rnum, (n = 15) + 1, 0, "/dev/urandom"); - } return rnum[n--] & 0xf; } diff --git a/util/nvmutil/nvmutil.h b/util/nvmutil/nvmutil.h index 458b4338..18255c3e 100644 --- a/util/nvmutil/nvmutil.h +++ b/util/nvmutil/nvmutil.h @@ -43,7 +43,7 @@ uint8_t *buf = (uint8_t *) &buf16; size_t nf = 128, gbe[2]; uint8_t skipread[2] = {0, 0}; -int flags = O_RDWR, fd = -1, part, gbeFileModified = 0; +int flags = O_RDWR, rfd, fd, part, gbeFileModified = 0; uint8_t nvmPartModified[2] = {0, 0}; int test = 1; @@ -54,7 +54,7 @@ int big_endian; #define xopen(f,l,p) if (opendir(l) != NULL) err(errno = EISDIR, "%s", l); \ if ((f = open(l, p)) == -1) err(ERR(), "%s", l); \ - struct stat st; if (fstat(f, &st) == -1) err(ERR(), "%s", l) + if (fstat(f, &st) == -1) err(ERR(), "%s", l) #define xpread(f, b, n, o, l) if (pread(f, b, n, o) == -1) err(ERR(), "%s", l) #define handle_endianness() if (big_endian) xorswap_buf(p) #define xpwrite(f, b, n, o, l) if (pwrite(f, b, n, o) == -1) err(ERR(), "%s", l) |