libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

util/nvmutil: major cleanup. simpler arg handling. 

Also hardened the pledges.

Signed-off-by: Leah Rowe <leah@libreboot.org>
fsdg20230625
Leah Rowe 2023-06-03 12:06:36 +01:00
parent c9fdfce34e
commit 46a9eea0f6
2 changed files with 51 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
util/nvmutil/nvmutil.c
View File

@ -7,52 +7,25 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
xpledge("stdio rpath wpath unveil", NULL); xpledge("stdio rpath wpath unveil", NULL);
if (argc < 3) for (int i = 0; i < 6; i++)
err(errno = EINVAL, NULL); if (strcmp(COMMAND, op[i].str) == 0)
if (strcmp(COMMAND, "dump") == 0) if (!(cmd = argc >= op[i].args ? op[i].cmd : NULL))
flags = O_RDONLY; break;
if (cmd == cmd_setmac)
strMac = (argc > 3) ? MAC_ADDRESS : strRMac;
else if ((cmd != NULL) && (argc > 3))
err_if((errno = (!((part = PARTNUM[0] - '0') == 0 || part == 1))
|| PARTNUM[1] ? EINVAL : errno));
err_if((errno = (!cmd) ? EINVAL : errno));
nf = ((cmd == cmd_swap) || (cmd == cmd_copy)) ? SIZE_4KB : nf;
flags = (strcmp(COMMAND, "dump") == 0) ? O_RDONLY : flags;
openFiles(FILENAME); openFiles(FILENAME);
void (*cmd)(void) = NULL;
const char *strMac = NULL, *strRMac = "??:??:??:??:??:??";
if (argc == 3) {
if (strcmp(COMMAND, "dump") == 0) {
cmd = &cmd_dump;
} else if (strcmp(COMMAND, "setmac") == 0) {
strMac = (char *) strRMac; /* random mac address */
} else if (strcmp(COMMAND, "swap") == 0) {
cmd = &cmd_swap;
nf = SIZE_4KB;
}
} else if (argc == 4) {
if (strcmp(COMMAND, "setmac") == 0) {
strMac = MAC_ADDRESS; /* user-supplied mac address */
} else if ((!((part = PARTNUM[0] - '0') == 0 || part == 1))
|| PARTNUM[1]) { /* only allow '1' or '0' */
errno = EINVAL;
} else if (strcmp(COMMAND, "setchecksum") == 0) {
cmd = &cmd_setchecksum;
} else if (strcmp(COMMAND, "brick") == 0) {
cmd = &cmd_brick;
} else if (strcmp(COMMAND, "copy") == 0) {
cmd = &cmd_copy;
nf = SIZE_4KB;
}
}
err_if((errno = ((strMac == NULL) && (cmd == NULL)) ? EINVAL : errno));
skipread[part ^ 1] = (cmd == &cmd_copy) | (cmd == &cmd_setchecksum)
| (cmd == &cmd_brick);
readGbeFile(FILENAME); readGbeFile(FILENAME);
if (strMac != NULL) (*cmd)();
cmd_setmac(strMac); /* nvm gbe.bin setmac */
else if (cmd != NULL)
(*cmd)(); /* all other commands except setmac */
if ((gbeFileModified) && (flags != O_RDONLY)) if ((gbeFileModified) && (flags != O_RDONLY))
writeGbeFile(FILENAME); writeGbeFile(FILENAME);
err_if((errno != 0) && (cmd != &cmd_dump)); err_if((errno != 0) && (cmd != &cmd_dump));
return errno; return errno;
} }
@ -67,17 +40,16 @@ openFiles(const char *path)
xopen(rfd, "/dev/urandom", O_RDONLY); xopen(rfd, "/dev/urandom", O_RDONLY);
errno = errno != ENOTDIR ? errno : 0; errno = errno != ENOTDIR ? errno : 0;
xunveil("/dev/urandom", "r"); xunveil("/dev/urandom", "r");
if (flags != O_RDONLY) { if (flags != O_RDONLY)
xunveil(path, "w"); xunveil(path, "w");
xpledge("stdio wpath", NULL); xpledge("stdio", NULL);
} else
xpledge("stdio", NULL);
} }
void void
readGbeFile(const char *path) readGbeFile(const char *path)
{ {
big_endian = ((uint8_t *) &test)[0] ^ 1; skipread[part ^ 1] = (cmd == &cmd_copy) | (cmd == &cmd_setchecksum)
| (cmd == &cmd_brick);
gbe[1] = (gbe[0] = (size_t) buf) + SIZE_4KB; gbe[1] = (gbe[0] = (size_t) buf) + SIZE_4KB;
for (int p = 0; p < 2; p++) { for (int p = 0; p < 2; p++) {
if (skipread[p]) if (skipread[p])
@ -88,12 +60,10 @@ readGbeFile(const char *path)
} }
void void
cmd_setmac(const char *strMac) cmd_setmac(void)
{ {
uint16_t mac[3] = {0, 0, 0};
if (invalidMacAddress(strMac, mac)) if (invalidMacAddress(strMac, mac))
err(errno = ECANCELED, "Bad MAC address"); err(errno = ECANCELED, "Bad MAC address");
for (int partnum = 0; partnum < 2; partnum++) { for (int partnum = 0; partnum < 2; partnum++) {
if (validChecksum(part = partnum)) { if (validChecksum(part = partnum)) {
for (int w = 0; w < 3; w++) for (int w = 0; w < 3; w++)
@ -106,10 +76,9 @@ cmd_setmac(const char *strMac)
int int
invalidMacAddress(const char *strMac, uint16_t *mac) invalidMacAddress(const char *strMac, uint16_t *mac)
{ {
uint8_t h;
uint64_t total = 0; uint64_t total = 0;
if (strnlen(strMac, 20) == 17) { if (strnlen(strMac, 20) == 17) {
for (int i = 0; i < 16; i += 3) { for (uint8_t h, i = 0; i < 16; i += 3) {
if (i != 15) if (i != 15)
if (strMac[i + 2] != ':') if (strMac[i + 2] != ':')
return 1; return 1;
@ -136,17 +105,13 @@ hextonum(char ch)
return ch - 'A' + 10; return ch - 'A' + 10;
else if ((ch >= 'a') && (ch <= 'f')) else if ((ch >= 'a') && (ch <= 'f'))
return ch - 'a' + 10; return ch - 'a' + 10;
else if (ch == '?') return (ch == '?') ? rhex() : 16;
return rhex(); /* random number */
else
return 16;
} }
uint8_t uint8_t
rhex(void) rhex(void)
{ {
static int n = 0; static uint8_t n = 0, rnum[16];
static uint8_t rnum[16];
if (!n) if (!n)
xpread(rfd, (uint8_t *) &rnum, (n = 15) + 1, 0, "/dev/urandom"); xpread(rfd, (uint8_t *) &rnum, (n = 15) + 1, 0, "/dev/urandom");
return rnum[n--] & 0xf; return rnum[n--] & 0xf;
@ -155,24 +120,20 @@ rhex(void)
void void
cmd_dump(void) cmd_dump(void)
{ {
int partnum, numInvalid = 0; for (int partnum = 0, numInvalid = 0; partnum < 2; partnum++) {
for (partnum = 0; partnum < 2; partnum++) {
if (!validChecksum(partnum)) if (!validChecksum(partnum))
++numInvalid; ++numInvalid;
printf("MAC (part %d): ", partnum); printf("MAC (part %d): ", partnum);
showmac(partnum); showmac(partnum), hexdump(partnum);
hexdump(partnum); errno = ((numInvalid < 2) && (partnum)) ? 0 : errno;
} }
if (numInvalid < 2)
errno = 0;
} }
void void
showmac(int partnum) showmac(int partnum)
{ {
uint16_t val16;
for (int c = 0; c < 3; c++) { for (int c = 0; c < 3; c++) {
val16 = word(c, partnum); uint16_t val16 = word(c, partnum);
printf("%02x:%02x", val16 & 0xff, val16 >> 8); printf("%02x:%02x", val16 & 0xff, val16 >> 8);
printf(c == 2 ? "\n" : ":"); printf(c == 2 ? "\n" : ":");
} }
@ -186,8 +147,7 @@ hexdump(int partnum)
for (int c = 0; c < 8; c++) { for (int c = 0; c < 8; c++) {
uint16_t val16 = word((row << 3) + c, partnum); uint16_t val16 = word((row << 3) + c, partnum);
printf(" %02x%02x", val16 >> 8, val16 & 0xff); printf(" %02x%02x", val16 >> 8, val16 & 0xff);
} } printf("\n");
printf("\n");
} }
} }
@ -210,17 +170,15 @@ cmd_brick(void)
void void
cmd_swap(void) cmd_swap(void)
{ {
gbeFileModified = nvmPartModified[0] = nvmPartModified[1] if ((gbeFileModified = nvmPartModified[0] = nvmPartModified[1]
= validChecksum(1) | validChecksum(0); = validChecksum(1) | validChecksum(0)))
if (gbeFileModified)
xorswap(gbe[0], gbe[1]); /* speedhack: swap ptr, not words */ xorswap(gbe[0], gbe[1]); /* speedhack: swap ptr, not words */
} }
void void
cmd_copy(void) cmd_copy(void)
{ {
gbeFileModified = nvmPartModified[part ^ 1] = validChecksum(part); if ((gbeFileModified = nvmPartModified[part ^ 1] = validChecksum(part)))
if (gbeFileModified)
gbe[part ^ 1] = gbe[part]; /* speedhack: copy ptr, not words */ gbe[part ^ 1] = gbe[part]; /* speedhack: copy ptr, not words */
} }
@ -254,8 +212,7 @@ xorswap_buf(int partnum)
void void
writeGbeFile(const char *filename) writeGbeFile(const char *filename)
{ {
if (gbeFileModified) errno = 0;
errno = 0;
for (int x = gbe[0] > gbe[1] ? 1 : 0, p = 0; p < 2; p++, x ^= 1) { for (int x = gbe[0] > gbe[1] ? 1 : 0, p = 0; p < 2; p++, x ^= 1) {
if (!nvmPartModified[x]) if (!nvmPartModified[x])
continue; continue;
@ -263,5 +220,4 @@ writeGbeFile(const char *filename)
xpwrite(fd, (uint8_t *) gbe[x], nf, x << 12, filename); xpwrite(fd, (uint8_t *) gbe[x], nf, x << 12, filename);
} }
xclose(fd, filename); xclose(fd, filename);
xpledge("stdio", NULL);
} }

28
util/nvmutil/nvmutil.h
View File

@ -15,7 +15,7 @@
void openFiles(const char *path); void openFiles(const char *path);
void readGbeFile(const char *path); void readGbeFile(const char *path);
void cmd_setmac(const char *strMac); void cmd_setmac(void);
int invalidMacAddress(const char *strMac, uint16_t *mac); int invalidMacAddress(const char *strMac, uint16_t *mac);
uint8_t hextonum(char chs); uint8_t hextonum(char chs);
uint8_t rhex(void); uint8_t rhex(void);
@ -38,16 +38,28 @@ void writeGbeFile(const char *filename);
#define SIZE_4KB 0x1000 #define SIZE_4KB 0x1000
#define SIZE_8KB 0x2000 #define SIZE_8KB 0x2000
uint16_t buf16[SIZE_4KB]; uint16_t buf16[SIZE_4KB], mac[3] = {0, 0, 0};
uint8_t *buf = (uint8_t *) &buf16; uint8_t *buf = (uint8_t *) &buf16;
size_t nf = 128, gbe[2]; size_t nf = 128, gbe[2];
uint8_t skipread[2] = {0, 0}; uint8_t nvmPartModified[2] = {0, 0}, skipread[2] = {0, 0};
int endian = 1, flags = O_RDWR, rfd, fd, part, gbeFileModified = 0;
int flags = O_RDWR, rfd, fd, part, gbeFileModified = 0; const char *strMac = NULL, *strRMac = "??:??:??:??:??:??";
uint8_t nvmPartModified[2] = {0, 0};
int test = 1; typedef struct op {
int big_endian; char *str;
void (*cmd)(void);
int args;
} op_t;
op_t op[] = {
{ .str = "dump", .cmd = cmd_dump, .args = 3},
{ .str = "setmac", .cmd = cmd_setmac, .args = 3},
{ .str = "swap", .cmd = cmd_swap, .args = 3},
{ .str = "copy", .cmd = cmd_copy, .args = 4},
{ .str = "brick", .cmd = cmd_brick, .args = 4},
{ .str = "setchecksum", .cmd = cmd_setchecksum, .args = 4},
};
void (*cmd)(void) = NULL;
#define ERR() errno = errno ? errno : ECANCELED #define ERR() errno = errno ? errno : ECANCELED
#define err_if(x) if (x) err(ERR(), NULL) #define err_if(x) if (x) err(ERR(), NULL)
@ -56,7 +68,7 @@ int big_endian;
if ((f = open(l, p)) == -1) err(ERR(), "%s", l); \ if ((f = open(l, p)) == -1) err(ERR(), "%s", l); \
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 xpread(f, b, n, o, l) if (pread(f, b, n, o) == -1) err(ERR(), "%s", l)
#define handle_endianness(r) if (big_endian) xorswap_buf(r) #define handle_endianness(r) if (((uint8_t *) &endian)[0] ^ 1) xorswap_buf(r)
#define xpwrite(f, b, n, o, l) if (pwrite(f, b, n, o) == -1) err(ERR(), "%s", l) #define xpwrite(f, b, n, o, l) if (pwrite(f, b, n, o) == -1) err(ERR(), "%s", l)
#define xclose(f, l) if (close(f) == -1) err(ERR(), "%s", l) #define xclose(f, l) if (close(f) == -1) err(ERR(), "%s", l)