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

util/nvmutil: simplified error handling in rhex()

fsdg20230625
lbmkplaceholder 2022-12-21 15:45:17 +00:00
parent 04da953c71
commit 6ebd178f28
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/nvmutil/nvmutil.c
View File

@ -178,11 +178,9 @@ cmd_setmac(const char *strMac)
goto invalid_mac_address;
byte = o / 3;
for (nib = 0; nib < 2; nib++, total += val8) {
if ((val8 = hextonum(strMac[o + nib])) > 15) {
if (errno != 0)
return;
if ((val8 = hextonum(strMac[o + nib])) > 15)
goto invalid_mac_address;
} else if ((byte == 0) && (nib == 1)) {
if ((byte == 0) && (nib == 1)) {
if (strMac[o + nib] == '?')
val8 = (val8 & 0xE) | 2;
}
@ -258,12 +256,10 @@ rhex(void)
rfd = -1;
}
if (readFromFile(&rfd, rbuf, "/dev/urandom", O_RDONLY, BUFSIZ)
!= BUFSIZ) {
warn("%s", "/dev/urandom");
return 16;
}
!= BUFSIZ)
err(errno, "/dev/urandom");
if (errno != 0)
return 16;
err(errno, "/dev/urandom");
}
return rbuf[rindex++] & 0xf;