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

util/nvmutil: less obscure mac address zero check

Browse Source 
make it totally clear what's going on.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-03 23:37:59 +00:00
parent 8c5c4e1b93
commit 76d6900d69
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+11 -6
View File
@@ -23,7 +23,7 @@ static void read_gbe(void);
static void read_gbe_part(int, int); static void read_gbe_part(int, int);
static void cmd_setmac(void); static void cmd_setmac(void);
static void parse_mac_string(void); static void parse_mac_string(void);
static void set_mac_byte(int, uint64_t *); static void set_mac_byte(int);
static void check_mac_separator(int); static void check_mac_separator(int);
static void set_mac_nib(int, int, uint8_t *); static void set_mac_nib(int, int, uint8_t *);
static uint8_t hextonum(char); static uint8_t hextonum(char);
@@ -293,8 +293,9 @@ cmd_setmac(void)
static void static void
parse_mac_string(void) parse_mac_string(void)
{ {
size_t c;
int mac_pos; int mac_pos;
uint64_t total = 0; uint64_t mac_total;
if (strnlen(mac, 20) != 17) if (strnlen(mac, 20) != 17)
err(EINVAL, "Invalid MAC address string length"); err(EINVAL, "Invalid MAC address string length");
@@ -302,22 +303,26 @@ parse_mac_string(void)
(void) memset(macbuf, 0, sizeof(macbuf)); (void) memset(macbuf, 0, sizeof(macbuf));
for (mac_pos = 0; mac_pos < 16; mac_pos += 3) for (mac_pos = 0; mac_pos < 16; mac_pos += 3)
set_mac_byte(mac_pos, &total); set_mac_byte(mac_pos);
if (total == 0) mac_total = 0;
for (c = 0; c < sizeof(macbuf); c++)
mac_total += macbuf[c];
if (mac_total == 0)
err(EINVAL, "Invalid MAC (all-zero MAC address)"); err(EINVAL, "Invalid MAC (all-zero MAC address)");
if (macbuf[0] & 1) if (macbuf[0] & 1)
err(EINVAL, "Invalid MAC (multicast bit set)"); err(EINVAL, "Invalid MAC (multicast bit set)");
} }
static void static void
set_mac_byte(int mac_pos, uint64_t *total) set_mac_byte(int mac_pos)
{ {
int nib; int nib;
uint8_t h = 0; uint8_t h = 0;
check_mac_separator(mac_pos); check_mac_separator(mac_pos);
for (nib = 0; nib < 2; nib++, *total += h) for (nib = 0; nib < 2; nib++)
set_mac_nib(mac_pos, nib, &h); set_mac_nib(mac_pos, nib, &h);
} }