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

util/nvmutil: rename valid_read

Browse Source 
it doesn't just validate, but also exits.

rename it accordingly, to: check_read_or_die

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-04 00:01:28 +00:00
parent be28140741
commit 6035a1bb6a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+6 -4
View File
@@ -29,7 +29,8 @@ static void set_mac_nib(int, int, uint8_t *);
static uint8_t hextonum(char); static uint8_t hextonum(char);
static uint8_t rhex(void); static uint8_t rhex(void);
static void read_urandom(uint8_t *, size_t); static void read_urandom(uint8_t *, size_t);
static int valid_read(const char *, ssize_t, size_t, int, const char *); static int check_read_or_die(const char *,
ssize_t, size_t, int, const char *);
static int write_mac_part(int); static int write_mac_part(int);
static void cmd_dump(void); static void cmd_dump(void);
static void print_mac_address(int); static void print_mac_address(int);
@@ -266,7 +267,7 @@ read_gbe_part(int p, int invert)
rval = pread(fd, buf + (SIZE_4KB * (p ^ invert)), rval = pread(fd, buf + (SIZE_4KB * (p ^ invert)),
SIZE_4KB, ((off_t ) p) * partsize); SIZE_4KB, ((off_t ) p) * partsize);
if (valid_read(fname, rval, SIZE_4KB, retry, "pread")) if (check_read_or_die(fname, rval, SIZE_4KB, retry, "pread"))
break; break;
} }
@@ -395,13 +396,14 @@ read_urandom(uint8_t *rnum, size_t rsize)
for (retry = 0; retry < MAX_RETRY_READ; retry++) { for (retry = 0; retry < MAX_RETRY_READ; retry++) {
rval = read(rfd, rnum, rsize); rval = read(rfd, rnum, rsize);
if (valid_read("/dev/urandom", rval, rsize, retry, "read")) if (check_read_or_die("/dev/urandom", rval,
rsize, retry, "read"))
break; break;
} }
} }
static int static int
valid_read(const char *rpath, ssize_t rval, size_t rsize, check_read_or_die(const char *rpath, ssize_t rval, size_t rsize,
int retry, const char *readtype) int retry, const char *readtype)
{ {
if (rval == (ssize_t) rsize) if (rval == (ssize_t) rsize)