util/mkhtemp: extremely hardened mkhtemp

This will also be used in lbmk itself at some point,
which currently just uses regular mktemp, for tmpdir
handling during the build process.

Renamed util/nvmutil to util/libreboot-utils, which
now contains two tools. The new tool, mkhtemp, is a
hardened implementation of mktemp, which nvmutil
also uses now. Still experimental, but good enough
for nvmutil.

Mkhtemp attempts to provide TOCTOU resistance on
Linux, by using modern features in Linux such as
Openat2 (syscall) with O_EXCL and O_TMPFILE,
and many various security checks e.g.
inode/dev during creation. Checks are done constantly,
to try to detect race conditions. The code is very
strict about things like sticky bits in world writeable
directories, also ownership (it can be made to bar even
root access on files and directories it doesn't own).

It's a security-first implementation of mktemp, likely
even more secure than the OpenBSD mkstemp, but more
auditing and testing is needed - more features are
also planned, including a compatibility mode to make
it also work like traditional mktemp/mkstemp. The
intention, once this becomes stable, is that it will
become a modern drop-in replacement for mkstemp on
Linux and BSD systems.

Some legacy code has been removed, and in general
cleaned up. I wrote mkhtemp for nvmutil, as part of
its atomic write behaviour, but mktemp was the last
remaining liability, so I rewrote that too!

Docs/manpage/website will be made for mkhtemp once
the code is mature.

Other changes have also been made. This is from another
experimental branch of Libreboot, that I'm pushing
early. For example, nvmutil's state machine has been
tidied up, moving more logic back into main.

Mktemp is historically prone to race conditions,
e.g. symlink attacks, directory replacement, remounting
during operation, all sorts of things. Mkhtemp has
been written to solve, or otherwise mitigate, that
problem. Mkhtemp is currently experimental and will
require a major cleanup at some point, but it
already works well enough, and you can in fact use
it; at this time, the -d, -p and -q flags are
supported, and you can add a custom template at
the end, e.g.

mkhtemp -p test -d

Eventually, I will make this have complete parity
with the GNU and BSD implementations, so that it is
fully useable on existing setups, while optionally
providing the hardening as well.

A lot of code has also been tidied up. I didn't
track the changes I made with this one, because
it was a major re-write of nvmutil; it is now
libreboot-utils, and I will continue to write
more programs in here over time. It's basically
now a bunch of hardened wrappers around various
libc functions, e.g. there is also a secure I/O
wrapper for read/write.

There is a custom randomisation function, rlong,
which simply uses arc4random or getrandom, on
BSD and Linux respectively. Efforts are made to
make it as reliable as possible, to the extent
that it never returns with failure; in the unlikely
event that it fails, it aborts. It also sleeps
between failure, to mitigate certain DoS attacks.

You can just go in util/libreboot-utils and
type make, then you will have the nvmutil and
mkhtemp binaries, which you can just use. It
all works. Everything was massively rewritten.

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 0 insertions, 649 deletions

diff --git a/util/nvmutil/lib/io.c b/util/nvmutil/lib/io.c
deleted file mode 100644
index 5769dd05..00000000
--- a/util/nvmutil/lib/io.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/* SPDX-License-Identifier: MIT
- * Copyright (c) 2026 Leah Rowe <leah@libreboot.org>
- *
- * I/O functions specific to nvmutil.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "../include/common.h"
-
-void
-open_gbe_file(void)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct commands *cmd = &x->cmd[x->i];
-	struct xfile *f = &x->f;
-
-	int _flags;
-
-	xopen(&f->gbe_fd, f->fname,
-	    cmd->flags | O_BINARY |
-	    O_NOFOLLOW | O_CLOEXEC, &f->gbe_st);
-
-	if (f->gbe_st.st_nlink > 1)
-		err(EINVAL,
-		    "%s: warning: file has multiple (%lu) hard links\n",
-		    f->fname, (unsigned long)f->gbe_st.st_nlink);
-
-	if (f->gbe_st.st_nlink == 0)
-		err(EIO, "%s: file unlinked while open", f->fname);
-
-	_flags = fcntl(f->gbe_fd, F_GETFL);
-	if (_flags == -1)
-		err(errno, "%s: fcntl(F_GETFL)", f->fname);
-
-	/* O_APPEND allows POSIX write() to ignore
-	 * the current write offset and write at EOF,
-	 * which would break positional read/write
-	 */
-
-	if (_flags & O_APPEND)
-		err(EIO, "%s: O_APPEND flag", f->fname);
-
-	f->gbe_file_size = f->gbe_st.st_size;
-
-	switch (f->gbe_file_size) {
-	case SIZE_8KB:
-	case SIZE_16KB:
-	case SIZE_128KB:
-		break;
-	default:
-		err(EINVAL, "File size must be 8KB, 16KB or 128KB");
-	}
-
-	if (lock_file(f->gbe_fd, cmd->flags) == -1)
-		err(errno, "%s: can't lock", f->fname);
-}
-
-void
-copy_gbe(void)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct xfile *f = &x->f;
-
-	read_file();
-
-	if (f->gbe_file_size == SIZE_8KB)
-		return;
-
-	memcpy(f->buf + (unsigned long)GBE_PART_SIZE,
-	    f->buf + (unsigned long)(f->gbe_file_size >> 1),
-	    (unsigned long)GBE_PART_SIZE);
-}
-
-void
-read_file(void)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct xfile *f = &x->f;
-
-	struct stat _st;
-	long _r;
-
-	/* read main file
-	 */
-	_r = rw_file_exact(f->gbe_fd, f->buf, f->gbe_file_size,
-	    0, IO_PREAD, NO_LOOP_EAGAIN, LOOP_EINTR,
-	    MAX_ZERO_RW_RETRY, OFF_ERR);
-
-	if (_r < 0)
-		err(errno, "%s: read failed", f->fname);
-
-	/* copy to tmpfile
-	 */
-	_r = rw_file_exact(f->tmp_fd, f->buf, f->gbe_file_size,
-	    0, IO_PWRITE, NO_LOOP_EAGAIN, LOOP_EINTR,
-	    MAX_ZERO_RW_RETRY, OFF_ERR);
-
-	if (_r < 0)
-		err(errno, "%s: %s: copy failed",
-		    f->fname, f->tname);
-
-	/* file size comparison
-	 */
-	if (fstat(f->tmp_fd, &_st) == -1)
-		err(errno, "%s: stat", f->tname);
-
-	f->gbe_tmp_size = _st.st_size;
-
-	if (f->gbe_tmp_size != f->gbe_file_size)
-		err(EIO, "%s: %s: not the same size",
-		    f->fname, f->tname);
-
-	/* needs sync, for verification
-	 */
-	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,
-	    0, IO_PREAD, NO_LOOP_EAGAIN, LOOP_EINTR,
-	    MAX_ZERO_RW_RETRY, OFF_ERR);
-
-	if (_r < 0)
-		err(errno, "%s: read failed (cmp)", f->tname);
-
-	if (memcmp(f->buf, f->bufcmp, f->gbe_file_size) != 0)
-		err(errno, "%s: %s: read contents differ (pre-test)",
-		    f->fname, f->tname);
-}
-
-void
-write_gbe_file(void)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct commands *cmd = &x->cmd[x->i];
-	struct xfile *f = &x->f;
-
-	unsigned long p;
-	unsigned char update_checksum;
-
-	if ((cmd->flags & O_ACCMODE) == O_RDONLY)
-		return;
-
-	if (same_file(f->tmp_fd, &f->tmp_st, 0) < 0)
-		err(errno, "%s: file inode/device changed", f->tname);
-
-	if (same_file(f->gbe_fd, &f->gbe_st, 1) < 0)
-		err(errno, "%s: file has changed", f->fname);
-
-	update_checksum = cmd->chksum_write;
-
-	for (p = 0; p < 2; p++) {
-		if (!f->part_modified[p])
-			continue;
-
-		if (update_checksum)
-			set_checksum(p);
-
-		rw_gbe_file_part(p, IO_PWRITE, "pwrite");
-	}
-}
-
-void
-rw_gbe_file_part(unsigned long p, int rw_type,
-    const char *rw_type_str)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct commands *cmd = &x->cmd[x->i];
-	struct xfile *f = &x->f;
-
-	long rval;
-
-	off_t file_offset;
-
-	unsigned long gbe_rw_size;
-	unsigned char *mem_offset;
-
-	gbe_rw_size = cmd->rw_size;
-
-	if (rw_type < IO_PREAD || rw_type > IO_PWRITE)
-		err(errno, "%s: %s: part %lu: invalid rw_type, %d",
-		    f->fname, rw_type_str, (unsigned long)p, rw_type);
-
-	mem_offset = gbe_mem_offset(p, rw_type_str);
-	file_offset = (off_t)gbe_file_offset(p, rw_type_str);
-
-	rval = rw_gbe_file_exact(f->tmp_fd, mem_offset,
-	    gbe_rw_size, file_offset, rw_type);
-
-	if (rval == -1)
-		err(errno, "%s: %s: part %lu",
-		    f->fname, rw_type_str, (unsigned long)p);
-
-	if ((unsigned long)rval != gbe_rw_size)
-		err(EIO, "%s: partial %s: part %lu",
-		    f->fname, rw_type_str, (unsigned long)p);
-}
-
-void
-write_to_gbe_bin(void)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct commands *cmd = &x->cmd[x->i];
-	struct xfile *f = &x->f;
-
-	int saved_errno;
-	int mv;
-
-	if ((cmd->flags & O_ACCMODE) != O_RDWR)
-		return;
-
-	write_gbe_file();
-
-	/* We may otherwise read from
-	 * cache, so we must sync.
-	 */
-
-	if (fsync_on_eintr(f->tmp_fd) == -1)
-		err(errno, "%s: fsync (pre-verification)",
-		    f->tname);
-
-	check_written_part(0);
-	check_written_part(1);
-
-	report_io_err_rw();
-
-	if (f->io_err_gbe)
-		err(EIO, "%s: bad write", f->fname);
-
-	saved_errno = errno;
-
-	if (close_on_eintr(f->tmp_fd) == -1) {
-		fprintf(stderr, "FAIL: %s: close\n", f->tname);
-		f->io_err_gbe_bin = 1;
-	}
-
-	if (close_on_eintr(f->gbe_fd) == -1) {
-		fprintf(stderr, "FAIL: %s: close\n", f->fname);
-		f->io_err_gbe_bin = 1;
-	}
-
-	errno = saved_errno;
-
-	/* tmpfile written, now we
-	 * rename it back to the main file
-	 * (we do atomic writes)
-	 */
-
-	f->tmp_fd = -1;
-	f->gbe_fd = -1;
-
-	if (!f->io_err_gbe_bin) {
-
-		mv = gbe_mv();
-
-		if (mv < 0) {
-
-			f->io_err_gbe_bin = 1;
-
-			fprintf(stderr, "%s: %s\n",
-			    f->fname, strerror(errno));
-		} else {
-
-			/* removed by rename
-			 */
-
-			if (f->tname != NULL)
-				free(f->tname);
-
-			f->tname = NULL;
-		}
-	}
-
-	if (!f->io_err_gbe_bin)
-		return;
-
-	fprintf(stderr, "FAIL (rename): %s: skipping fsync\n",
-	    f->fname);
-	if (errno)
-		fprintf(stderr,
-		    "errno %d: %s\n", errno, strerror(errno));
-}
-
-void
-check_written_part(unsigned long p)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct commands *cmd = &x->cmd[x->i];
-	struct xfile *f = &x->f;
-
-	long rval;
-
-	unsigned long gbe_rw_size;
-
-	off_t file_offset;
-	unsigned char *mem_offset;
-
-	unsigned char *buf_restore;
-
-	if (!f->part_modified[p])
-		return;
-
-	gbe_rw_size = cmd->rw_size;
-
-	mem_offset = gbe_mem_offset(p, "pwrite");
-	file_offset = (off_t)gbe_file_offset(p, "pwrite");
-
-	memset(f->pad, 0xff, sizeof(f->pad));
-
-	if (same_file(f->tmp_fd, &f->tmp_st, 0) < 0)
-		err(errno, "%s: file inode/device changed", f->tname);
-
-	if (same_file(f->gbe_fd, &f->gbe_st, 1) < 0)
-		err(errno, "%s: file changed during write", f->fname);
-
-	rval = rw_gbe_file_exact(f->tmp_fd, f->pad,
-	    gbe_rw_size, file_offset, IO_PREAD);
-
-	if (rval == -1)
-		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 (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] ||
-	    f->rw_check_partial_read[p])
-		return;
-
-	/* We only load one part on-file, into memory but
-	 * always at offset zero, for post-write checks.
-	 * That's why we hardcode good_checksum(0)
-	 */
-
-	buf_restore = f->buf;
-
-	/* good_checksum works on f->buf
-	 * so let's change f->buf for now
-	 */
-
-	f->buf = f->pad;
-
-	if (good_checksum(0))
-		f->post_rw_checksum[p] = 1;
-
-	f->buf = buf_restore;
-}
-
-void
-report_io_err_rw(void)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct xfile *f = &x->f;
-
-	unsigned long p;
-
-	if (!f->io_err_gbe)
-		return;
-
-	for (p = 0; p < 2; p++) {
-		if (!f->part_modified[p])
-			continue;
-
-		if (f->rw_check_err_read[p])
-			fprintf(stderr,
-			    "%s: pread: p%lu (post-verification)\n",
-			    f->fname, (unsigned long)p);
-		if (f->rw_check_partial_read[p])
-			fprintf(stderr,
-			    "%s: partial pread: p%lu (post-verification)\n",
-			    f->fname, (unsigned long)p);
-		if (f->rw_check_bad_part[p])
-			fprintf(stderr,
-			    "%s: pwrite: corrupt write on p%lu\n",
-			    f->fname, (unsigned long)p);
-
-		if (f->rw_check_err_read[p] ||
-		    f->rw_check_partial_read[p]) {
-			fprintf(stderr,
-			    "%s: p%lu: skipped checksum verification "
-			    "(because read failed)\n",
-			    f->fname, (unsigned long)p);
-
-			continue;
-		}
-
-		fprintf(stderr, "%s: ", f->fname);
-
-		if (f->post_rw_checksum[p])
-			fprintf(stderr, "GOOD");
-		else
-			fprintf(stderr, "BAD");
-
-		fprintf(stderr, " checksum in p%lu on-disk.\n",
-		    (unsigned long)p);
-
-		if (f->post_rw_checksum[p]) {
-			fprintf(stderr,
-			    "    This does NOT mean it's safe. it may be\n"
-			    "    salvageable if you use the cat feature.\n");
-		}
-	}
-}
-
-int
-gbe_mv(void)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct xfile *f = &x->f;
-
-	int rval;
-
-	int saved_errno;
-	int tmp_gbe_bin_exists;
-
-	char *dest_tmp;
-	int dest_fd;
-
-	/* will be set 0 if it doesn't
-	 */
-	tmp_gbe_bin_exists = 1;
-
-	dest_tmp = NULL;
-	dest_fd = -1;
-
-	saved_errno = errno;
-
-	rval = rename(f->tname, f->fname);
-
-	if (rval > -1) {
-
-		/* rename on same filesystem
-		 */
-
-		tmp_gbe_bin_exists = 0;
-
-		if (fsync_dir(f->fname) < 0) {
-			f->io_err_gbe_bin = 1;
-			rval = -1;
-		}
-
-		goto ret_gbe_mv;
-	}
-
-	if (errno != EXDEV)
-		goto ret_gbe_mv;
-
-	/*
-	 * OR, cross-filesystem rename:
-	 */
-
-	if ((rval = f->tmp_fd = open(f->tname,
-	    O_RDONLY | O_BINARY)) == -1)
-		goto ret_gbe_mv;
-
-	/* create replacement temp in target directory
-	 */
-	dest_tmp = new_tmpfile(&dest_fd, 1, f->fname);
-	if (dest_tmp == NULL)
-		goto ret_gbe_mv;
-
-	/* copy data
-	 */
-	rval = rw_file_exact(f->tmp_fd, f->bufcmp,
-	    f->gbe_file_size, 0, IO_PREAD,
-	    NO_LOOP_EAGAIN, LOOP_EINTR,
-	    MAX_ZERO_RW_RETRY, OFF_ERR);
-
-	if (rval < 0)
-		goto ret_gbe_mv;
-
-	rval = rw_file_exact(dest_fd, f->bufcmp,
-	    f->gbe_file_size, 0, IO_PWRITE,
-	    NO_LOOP_EAGAIN, LOOP_EINTR,
-	    MAX_ZERO_RW_RETRY, OFF_ERR);
-
-	if (rval < 0)
-		goto ret_gbe_mv;
-
-	if (fsync_on_eintr(dest_fd) == -1)
-		goto ret_gbe_mv;
-
-	if (close_on_eintr(dest_fd) == -1)
-		goto ret_gbe_mv;
-
-	if (rename(dest_tmp, f->fname) == -1)
-		goto ret_gbe_mv;
-
-	if (fsync_dir(f->fname) < 0) {
-		f->io_err_gbe_bin = 1;
-		goto ret_gbe_mv;
-	}
-
-	free(dest_tmp);
-	dest_tmp = NULL;
-
-ret_gbe_mv:
-
-	if (f->gbe_fd > -1) {
-		if (close_on_eintr(f->gbe_fd) < 0)
-			rval = -1;
-		if (fsync_dir(f->fname) < 0) {
-			f->io_err_gbe_bin = 1;
-			rval = -1;
-		}
-		f->gbe_fd = -1;
-	}
-
-	if (f->tmp_fd > -1) {
-		if (close_on_eintr(f->tmp_fd) < 0)
-			rval = -1;
-
-		f->tmp_fd = -1;
-	}
-
-	/* before this function is called,
-	 * tmp_fd may have been moved
-	 */
-	if (tmp_gbe_bin_exists) {
-		if (unlink(f->tname) < 0)
-			rval = -1;
-		else
-			tmp_gbe_bin_exists = 0;
-	}
-
-	if (rval < 0) {
-		/* if nothing set errno,
-		 * we assume EIO, or we
-		 * use what was set
-		 */
-		if (errno == saved_errno)
-			errno = EIO;
-	} else {
-		errno = saved_errno;
-	}
-
-	return rval;
-}
-
-/* This one is similar to gbe_file_offset,
- * but used to check Gbe bounds in memory,
- * and it is *also* used during file I/O.
- */
-unsigned char *
-gbe_mem_offset(unsigned long p, const char *f_op)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct xfile *f = &x->f;
-
-	off_t gbe_off;
-
-	gbe_off = gbe_x_offset(p, f_op, "mem",
-	    GBE_PART_SIZE, GBE_WORK_SIZE);
-
-	return (unsigned char *)
-	    (f->buf + (unsigned long)gbe_off);
-}
-
-/* I/O operations filtered here. These operations must
- * only write from the 0th position or the half position
- * within the GbE file, and write 4KB of data.
- */
-off_t
-gbe_file_offset(unsigned long p, const char *f_op)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct xfile *f = &x->f;
-
-	off_t gbe_file_half_size;
-
-	gbe_file_half_size = f->gbe_file_size >> 1;
-
-	return gbe_x_offset(p, f_op, "file",
-	    gbe_file_half_size, f->gbe_file_size);
-}
-
-off_t
-gbe_x_offset(unsigned long p, const char *f_op, const char *d_type,
-    off_t nsize, off_t ncmp)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct xfile *f = &x->f;
-
-	off_t off;
-
-	check_bin(p, "part number");
-
-	off = ((off_t)p) * (off_t)nsize;
-
-	if (off > ncmp - GBE_PART_SIZE)
-		err(ECANCELED, "%s: GbE %s %s out of bounds",
-		    f->fname, d_type, f_op);
-
-	if (off != 0 && off != ncmp >> 1)
-		err(ECANCELED, "%s: GbE %s %s at bad offset",
-		    f->fname, d_type, f_op);
-
-	return off;
-}
-
-long
-rw_gbe_file_exact(int fd, unsigned char *mem, unsigned long nrw,
-    off_t off, int rw_type)
-{
-	struct xstate *x = xstatus(0, NULL);
-	struct xfile *f = &x->f;
-
-	long r;
-
-	if (io_args(fd, mem, nrw, off, rw_type) == -1)
-		return -1;
-
-	if (mem != (void *)f->pad) {
-		if (mem < f->buf)
-			goto err_rw_gbe_file_exact;
-
-		if ((unsigned long)(mem - f->buf) >= GBE_WORK_SIZE)
-			goto err_rw_gbe_file_exact;
-	}
-
-	if (off < 0 || off >= f->gbe_file_size)
-		goto err_rw_gbe_file_exact;
-
-	if (nrw > (unsigned long)(f->gbe_file_size - off))
-		goto err_rw_gbe_file_exact;
-
-	if (nrw > (unsigned long)GBE_PART_SIZE)
-		goto err_rw_gbe_file_exact;
-
-	r = rw_file_exact(fd, mem, nrw, off, rw_type,
-	    NO_LOOP_EAGAIN, LOOP_EINTR, MAX_ZERO_RW_RETRY,
-	    OFF_ERR);
-
-	return rw_over_nrw(r, nrw);
-
-err_rw_gbe_file_exact:
-	errno = EIO;
-	return -1;
-}