summaryrefslogtreecommitdiff
path: root/util/nvmutil/lib
diff options
context:
space:
mode:
Diffstat (limited to 'util/nvmutil/lib')
-rw-r--r--util/nvmutil/lib/checksum.c9
-rw-r--r--util/nvmutil/lib/command.c16
-rw-r--r--util/nvmutil/lib/file.c159
-rw-r--r--util/nvmutil/lib/io.c31
-rw-r--r--util/nvmutil/lib/num.c14
-rw-r--r--util/nvmutil/lib/state.c8
-rw-r--r--util/nvmutil/lib/string.c51
-rw-r--r--util/nvmutil/lib/usage.c20
-rw-r--r--util/nvmutil/lib/word.c12
9 files changed, 82 insertions, 238 deletions
diff --git a/util/nvmutil/lib/checksum.c b/util/nvmutil/lib/checksum.c
index d006a106..465b76bf 100644
--- a/util/nvmutil/lib/checksum.c
+++ b/util/nvmutil/lib/checksum.c
@@ -7,22 +7,13 @@
* Related file: word.c
*/
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
-#include <fcntl.h>
#include <limits.h>
-#include <stdarg.h>
#include <stddef.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
#include "../include/common.h"
diff --git a/util/nvmutil/lib/command.c b/util/nvmutil/lib/command.c
index b70430aa..367c949a 100644
--- a/util/nvmutil/lib/command.c
+++ b/util/nvmutil/lib/command.c
@@ -5,21 +5,15 @@
* Command handlers for nvmutil
*/
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "../include/common.h"
@@ -421,17 +415,17 @@ cmd_helper_swap(void)
check_cmd(cmd_helper_swap, "swap");
- x_v_memcpy(
+ memcpy(
f->buf + (unsigned long)GBE_WORK_SIZE,
f->buf,
GBE_PART_SIZE);
- x_v_memcpy(
+ memcpy(
f->buf,
f->buf + (unsigned long)GBE_PART_SIZE,
GBE_PART_SIZE);
- x_v_memcpy(
+ memcpy(
f->buf + (unsigned long)GBE_PART_SIZE,
f->buf + (unsigned long)GBE_WORK_SIZE,
GBE_PART_SIZE);
@@ -448,7 +442,7 @@ cmd_helper_copy(void)
check_cmd(cmd_helper_copy, "copy");
- x_v_memcpy(
+ memcpy(
f->buf + (unsigned long)((f->part ^ 1) * GBE_PART_SIZE),
f->buf + (unsigned long)(f->part * GBE_PART_SIZE),
GBE_PART_SIZE);
diff --git a/util/nvmutil/lib/file.c b/util/nvmutil/lib/file.c
index 92d7ee7c..f90ecdba 100644
--- a/util/nvmutil/lib/file.c
+++ b/util/nvmutil/lib/file.c
@@ -5,21 +5,14 @@
* Safe file handling.
*/
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "../include/common.h"
@@ -74,7 +67,7 @@ xopen(int *fd_ptr, const char *path, int flags, struct stat *st)
err(errno, "%s: file not seekable", path);
}
-/* Ensure x_i_rename() is durable by syncing the
+/* Ensure rename() is durable by syncing the
* directory containing the target file.
*/
@@ -120,8 +113,8 @@ fsync_dir(const char *path)
if (dirbuf == NULL)
goto err_fsync_dir;
- x_v_memcpy(dirbuf, path, pathlen + 1);
- slash = x_c_strrchr(dirbuf, '/');
+ memcpy(dirbuf, path, pathlen + 1);
+ slash = strrchr(dirbuf, '/');
if (slash != NULL) {
*slash = '\0';
@@ -154,10 +147,10 @@ fsync_dir(const char *path)
}
/* sync file on disk */
- if (x_i_fsync(dirfd) == -1)
+ if (fsync_on_eintr(dirfd) == -1)
goto err_fsync_dir;
- if (x_i_close(dirfd) == -1)
+ if (close_on_eintr(dirfd) == -1)
goto err_fsync_dir;
if (dirbuf != NULL)
@@ -177,7 +170,7 @@ err_fsync_dir:
free(dirbuf);
if (dirfd > -1)
- x_i_close(dirfd);
+ close_on_eintr(dirfd);
errno = saved_errno;
@@ -219,7 +212,7 @@ new_tmpfile(int *fd, int local, const char *path)
*/
char tmp_none[] = "";
char tmp_default[] = "/tmp";
- char default_tmpname[] = "tmpXXXXXX";
+ char default_tmpname[] = "tmpXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
char *tmpname;
char *base = NULL;
@@ -302,22 +295,22 @@ new_tmpfile(int *fd, int local, const char *path)
*dest = '.'; /* hidden file */
- x_v_memcpy(dest + (unsigned long)1, tmpname, tmpname_len);
+ memcpy(dest + (unsigned long)1, tmpname, tmpname_len);
- x_v_memcpy(dest + (unsigned long)1 + tmpname_len,
+ memcpy(dest + (unsigned long)1 + tmpname_len,
default_tmpname, tmpdir_len);
} else {
- x_v_memcpy(dest, base, tmpdir_len);
+ memcpy(dest, base, tmpdir_len);
dest[tmpdir_len] = '/';
- x_v_memcpy(dest + tmpdir_len + 1, tmpname, tmpname_len);
+ memcpy(dest + tmpdir_len + 1, tmpname, tmpname_len);
}
dest[tmppath_len] = '\0';
- fd_tmp = x_i_mkstemp(dest);
+ fd_tmp = mkstemp_n(dest);
if (fd_tmp == -1)
goto err_new_tmpfile;
@@ -374,7 +367,7 @@ err_new_tmpfile:
free(dest);
if (fd_tmp > -1)
- x_i_close(fd_tmp);
+ close_on_eintr(fd_tmp);
return NULL;
}
@@ -428,36 +421,56 @@ x_c_tmpdir(void)
*/
int
-x_i_mkstemp(char *template)
+mkstemp_n(char *template)
{
int fd;
- int i, j;
+ unsigned long i, j;
unsigned long len;
char *p;
- char ch[] =
+ unsigned long xc = 0;
+
+ static char ch[] =
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
unsigned long r;
+ unsigned long max_len =
+#ifndef PATH_LEN
+ 4096;
+#else
+ (PATH_LEN);
+#endif
- len = xstrxlen(template, PATH_LEN);
+ len = xstrxlen(template, max_len);
- /* find trailing XXXXXX */
- if (len < 6)
+ if (len < 6) {
+ errno = EINVAL;
return -1;
+ }
- p = template + len - 6;
+ p = template + len;
- for (i = 0; i < 100; i++) {
+ while (p > template && p[-1] == 'X') {
+ --p;
+ ++xc;
+ }
+
+ if (xc < 6) {
+ errno = EINVAL;
+ return -1;
+ }
- for (j = 0; j < 6; j++) {
+ for (i = 0; i < 200; i++) {
+
+ for (j = 0; j < xc; j++) {
r = rlong();
p[j] = ch[(unsigned long)(r >> 1) % (sizeof(ch) - 1)];
}
- fd = open(template, O_RDWR | O_CREAT | O_EXCL, 0600);
+ fd = open(template,
+ O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC, 0600);
if (fd >= 0)
return fd;
@@ -613,12 +626,6 @@ prw(int fd, void *mem, unsigned long nrw,
int loop_eagain, int loop_eintr,
int off_reset)
{
-#ifndef MAX_EAGAIN_RETRIES
- unsigned long retries = 100000;
-#else
- unsigned long retries = MAX_EAGAIN_RETRIES;
-#endif
-
long r;
int positional_rw;
struct stat st;
@@ -686,14 +693,14 @@ real_pread_pwrite:
HAVE_REAL_PREAD_PWRITE > 0
goto real_pread_pwrite;
#else
- if ((off_orig = lseek_loop(fd, (off_t)0, SEEK_CUR,
+ if ((off_orig = lseek_on_eintr(fd, (off_t)0, SEEK_CUR,
loop_eagain, loop_eintr)) == (off_t)-1) {
r = -1;
- } else if (lseek_loop(fd, off, SEEK_SET,
+ } else if (lseek_on_eintr(fd, off, SEEK_SET,
loop_eagain, loop_eintr) == (off_t)-1) {
r = -1;
} else {
- verified = lseek_loop(fd, (off_t)0, SEEK_CUR,
+ verified = lseek_on_eintr(fd, (off_t)0, SEEK_CUR,
loop_eagain, loop_eintr);
/*
@@ -708,7 +715,7 @@ real_pread_pwrite:
* that nothing is touching it now.
*/
if (off_reset && off != verified)
- lseek_loop(fd, off, SEEK_SET,
+ lseek_on_eintr(fd, off, SEEK_SET,
loop_eagain, loop_eintr);
do {
@@ -729,7 +736,7 @@ real_pread_pwrite:
* will cause an exit, including
* per EINTR/EAGAIN re-spin.
*/
- verified = lseek_loop(fd, (off_t)0, SEEK_CUR,
+ verified = lseek_on_eintr(fd, (off_t)0, SEEK_CUR,
loop_eagain, loop_eintr);
if (off != verified)
@@ -747,13 +754,12 @@ real_pread_pwrite:
} while (r == -1 &&
(errno == try_err(loop_eintr, EINTR) ||
- errno == try_err(loop_eagain, EAGAIN)) &&
- retries++ < MAX_EAGAIN_RETRIES);
+ errno == try_err(loop_eagain, EAGAIN)));
}
saved_errno = errno;
- off_last = lseek_loop(fd, off_orig, SEEK_SET,
+ off_last = lseek_on_eintr(fd, off_orig, SEEK_SET,
loop_eagain, loop_eintr);
if (off_last != off_orig) {
@@ -883,12 +889,12 @@ err_rw_over_nrw:
#if !defined(HAVE_REAL_PREAD_PWRITE) || \
HAVE_REAL_PREAD_PWRITE < 1
/*
- * lseek_loop() does lseek() but optionally
+ * lseek_on_eintr() does lseek() but optionally
* on an EINTR/EAGAIN wait loop. Used by prw()
* for setting offsets for positional I/O.
*/
off_t
-lseek_loop(int fd, off_t off, int whence,
+lseek_on_eintr(int fd, off_t off, int whence,
int loop_eagain, int loop_eintr)
{
off_t old;
@@ -914,65 +920,8 @@ try_err(int loop_err, int errval)
return -1;
}
-/* portable rename(). WARNING:
- * not powercut-safe. do this to
- * use system rename:
- * #define SYS_RENAME 1
- *
- * written academically, but in reality,
- * nearly all unix systems have rename()
- */
-
-int
-x_i_rename(const char *src, const char *dst)
-{
-#if defined(SYS_RENAME) &&\
- SYS_RENAME > 0
- return rename(src, dst);
-#else
- int sfd, dirfd;
- ssize_t r;
- char buf[8192];
-
- sfd = open(src, O_RDONLY);
- if (sfd < 0)
- return -1;
-
- dirfd = open(dst, O_WRONLY | O_CREAT | O_TRUNC, 0600);
- if (dirfd < 0) {
- x_i_close(sfd);
- return -1;
- }
-
- while ((r = read(sfd, buf, sizeof(buf))) > 0) {
- ssize_t w = write(dirfd, buf, r);
- if (w != r) {
- x_i_close(sfd);
- x_i_close(dirfd);
- return -1;
- }
- }
-
- if (r < 0) {
- x_i_close(sfd);
- x_i_close(dirfd);
- return -1;
- }
-
- x_i_fsync(dirfd);
-
- x_i_close(sfd);
- x_i_close(dirfd);
-
- if (unlink(src) < 0)
- return -1;
-
- return 0;
-#endif
-}
-
int
-x_i_close(int fd)
+close_on_eintr(int fd)
{
int r;
int saved_errno = errno;
@@ -988,7 +937,7 @@ x_i_close(int fd)
}
int
-x_i_fsync(int fd)
+fsync_on_eintr(int fd)
{
int r;
diff --git a/util/nvmutil/lib/io.c b/util/nvmutil/lib/io.c
index 1a234b8f..06fd038f 100644
--- a/util/nvmutil/lib/io.c
+++ b/util/nvmutil/lib/io.c
@@ -5,21 +5,16 @@
* I/O functions specific to nvmutil.
*/
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
-#include <stdarg.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "../include/common.h"
@@ -84,7 +79,7 @@ copy_gbe(void)
if (f->gbe_file_size == SIZE_8KB)
return;
- x_v_memcpy(f->buf + (unsigned long)GBE_PART_SIZE,
+ memcpy(f->buf + (unsigned long)GBE_PART_SIZE,
f->buf + (unsigned long)(f->gbe_file_size >> 1),
(unsigned long)GBE_PART_SIZE);
}
@@ -130,7 +125,7 @@ read_file(void)
/* needs sync, for verification
*/
- if (x_i_fsync(f->tmp_fd) == -1)
+ if (fsync_on_eintr(f->tmp_fd) == -1)
err(errno, "%s: fsync (tmpfile copy)", f->tname);
_r = rw_file_exact(f->tmp_fd, f->bufcmp, f->gbe_file_size,
@@ -140,7 +135,7 @@ read_file(void)
if (_r < 0)
err(errno, "%s: read failed (cmp)", f->tname);
- if (x_i_memcmp(f->buf, f->bufcmp, f->gbe_file_size) != 0)
+ if (memcmp(f->buf, f->bufcmp, f->gbe_file_size) != 0)
err(errno, "%s: %s: read contents differ (pre-test)",
f->fname, f->tname);
}
@@ -232,7 +227,7 @@ write_to_gbe_bin(void)
* We may otherwise read from
* cache, so we must sync.
*/
- if (x_i_fsync(f->tmp_fd) == -1)
+ if (fsync_on_eintr(f->tmp_fd) == -1)
err(errno, "%s: fsync (pre-verification)",
f->tname);
@@ -251,12 +246,12 @@ write_to_gbe_bin(void)
saved_errno = errno;
- if (x_i_close(f->tmp_fd) == -1) {
+ if (close_on_eintr(f->tmp_fd) == -1) {
fprintf(stderr, "FAIL: %s: close\n", f->tname);
f->io_err_gbe_bin = 1;
}
- if (x_i_close(f->gbe_fd) == -1) {
+ if (close_on_eintr(f->gbe_fd) == -1) {
fprintf(stderr, "FAIL: %s: close\n", f->fname);
f->io_err_gbe_bin = 1;
}
@@ -336,7 +331,7 @@ check_written_part(unsigned long p)
f->rw_check_err_read[p] = f->io_err_gbe = 1;
else if ((unsigned long)rval != gbe_rw_size)
f->rw_check_partial_read[p] = f->io_err_gbe = 1;
- else if (x_i_memcmp(mem_offset, f->pad, gbe_rw_size) != 0)
+ else if (memcmp(mem_offset, f->pad, gbe_rw_size) != 0)
f->rw_check_bad_part[p] = f->io_err_gbe = 1;
if (f->rw_check_err_read[p] ||
@@ -440,7 +435,7 @@ gbe_mv(void)
saved_errno = errno;
- rval = x_i_rename(f->tname, f->fname);
+ rval = rename(f->tname, f->fname);
if (rval > -1) {
/*
@@ -489,13 +484,13 @@ gbe_mv(void)
if (rval < 0)
goto ret_gbe_mv;
- if (x_i_fsync(dest_fd) == -1)
+ if (fsync_on_eintr(dest_fd) == -1)
goto ret_gbe_mv;
- if (x_i_close(dest_fd) == -1)
+ if (close_on_eintr(dest_fd) == -1)
goto ret_gbe_mv;
- if (x_i_rename(dest_tmp, f->fname) == -1)
+ if (rename(dest_tmp, f->fname) == -1)
goto ret_gbe_mv;
if (fsync_dir(f->fname) < 0) {
@@ -509,7 +504,7 @@ gbe_mv(void)
ret_gbe_mv:
if (f->gbe_fd > -1) {
- if (x_i_close(f->gbe_fd) < 0)
+ if (close_on_eintr(f->gbe_fd) < 0)
rval = -1;
if (fsync_dir(f->fname) < 0) {
f->io_err_gbe_bin = 1;
@@ -519,7 +514,7 @@ ret_gbe_mv:
}
if (f->tmp_fd > -1) {
- if (x_i_close(f->tmp_fd) < 0)
+ if (close_on_eintr(f->tmp_fd) < 0)
rval = -1;
f->tmp_fd = -1;
diff --git a/util/nvmutil/lib/num.c b/util/nvmutil/lib/num.c
index 374cc9a0..0442b86c 100644
--- a/util/nvmutil/lib/num.c
+++ b/util/nvmutil/lib/num.c
@@ -9,17 +9,15 @@
#include <sys/param.h>
#endif
#include <sys/types.h>
-#include <sys/stat.h>
#include <errno.h>
-#include <fcntl.h>
+#if !((defined(__OpenBSD__) && (OpenBSD) >= 201) || \
+ defined(__FreeBSD__) || \
+ defined(__NetBSD__) || defined(__APPLE__))
+#include <fcntl.h> /* if not arc4random: /dev/urandom */
+#endif
#include <limits.h>
-#include <stdarg.h>
#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "../include/common.h"
@@ -82,7 +80,7 @@ rlong(void)
sizeof(unsigned long), 0, IO_READ, LOOP_EAGAIN,
LOOP_EINTR, MAX_ZERO_RW_RETRY, OFF_ERR);
- if (x_i_close(fd) < 0)
+ if (close_on_eintr(fd) < 0)
err(errno, "Can't close randomness fd");
if (nr != sizeof(unsigned long))
diff --git a/util/nvmutil/lib/state.c b/util/nvmutil/lib/state.c
index f4f83e48..946b8919 100644
--- a/util/nvmutil/lib/state.c
+++ b/util/nvmutil/lib/state.c
@@ -1,5 +1,4 @@
/* SPDX-License-Identifier: MIT
- *
* Copyright (c) 2022-2026 Leah Rowe <leah@libreboot.org>
*
* This tool lets you modify Intel GbE NVM (Gigabit Ethernet
@@ -21,7 +20,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "../include/common.h"
@@ -238,7 +236,7 @@ getnvmprogname(void)
rval = x->argv0;
}
- p = x_c_strrchr(rval, '/');
+ p = strrchr(rval, '/');
if (p)
return p + 1;
@@ -262,13 +260,13 @@ exit_cleanup(void)
f = &x->f;
if (f->gbe_fd > -1) {
- if (x_i_close(f->gbe_fd) == -1)
+ if (close_on_eintr(f->gbe_fd) == -1)
close_err = 1;
f->gbe_fd = -1;
}
if (f->tmp_fd > -1) {
- if (x_i_close(f->tmp_fd) == -1)
+ if (close_on_eintr(f->tmp_fd) == -1)
close_err = 1;
}
diff --git a/util/nvmutil/lib/string.c b/util/nvmutil/lib/string.c
index 517f490b..4139c354 100644
--- a/util/nvmutil/lib/string.c
+++ b/util/nvmutil/lib/string.c
@@ -1,25 +1,14 @@
/* SPDX-License-Identifier: MIT
- *
* Copyright (c) 2026 Leah Rowe <leah@libreboot.org>
*
* String handling.
*/
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "../include/common.h"
@@ -92,43 +81,3 @@ xstrxlen(const char *scmp, unsigned long maxlen)
return xstr_index;
}
-
-char *
-x_c_strrchr(const char *s, int c)
-{
- const char *p = NULL;
-
- for ( ; *s; s++)
- if (*s == (char)c)
- p = s;
-
- if (c == '\0')
- return (char *)s;
-
- return (char *)p;
-}
-
-void *
-x_v_memcpy(void *dst, const void *src, unsigned long n)
-{
- unsigned char *d = (unsigned char *)dst;
- const unsigned char *s = (const unsigned char *)src;
-
- while (n--)
- *d++ = *s++;
-
- return dst;
-}
-
-int
-x_i_memcmp(const void *a, const void *b, unsigned long n)
-{
- const unsigned char *pa = (const unsigned char *)a;
- const unsigned char *pb = (const unsigned char *)b;
-
- for ( ; n--; ++pa, ++pb)
- if (*pa != *pb)
- return *pa - *pb;
-
- return 0;
-}
diff --git a/util/nvmutil/lib/usage.c b/util/nvmutil/lib/usage.c
index e8a3cdf7..3b0614e8 100644
--- a/util/nvmutil/lib/usage.c
+++ b/util/nvmutil/lib/usage.c
@@ -1,35 +1,17 @@
/* SPDX-License-Identifier: MIT
- *
* Copyright (c) 2023 Riku Viitanen <riku.viitanen@protonmail.com>
* Copyright (c) 2026 Leah Rowe <leah@libreboot.org>
- *
*/
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-
#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
#include "../include/common.h"
void
usage(void)
{
- const char *util;
-
- util = getnvmprogname();
+ const char *util = getnvmprogname();
fprintf(stderr,
"Modify Intel GbE NVM images e.g. set MAC\n"
diff --git a/util/nvmutil/lib/word.c b/util/nvmutil/lib/word.c
index 4647c1f4..6fd5974c 100644
--- a/util/nvmutil/lib/word.c
+++ b/util/nvmutil/lib/word.c
@@ -6,22 +6,10 @@
* words on Intel GbE NVM configurations.
*/
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
#include <sys/types.h>
-#include <sys/stat.h>
#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdarg.h>
#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
#include "../include/common.h"
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-19 17:33:53 +0000