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

remove pledge in nvmutil

Browse Source 
don't fix it for now. this version was buggy.

i'm only using nvmutil for now, until i properly
fix all the memory issues in lbutils on openbsd.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-04-21 13:48:27 +01:00
parent 6f9f0f7321
commit b1b1d2cf0c
1 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/lib/state.c
-46
View File
@@ -4,9 +4,6 @@
* State machine (singleton) for nvmutil data. * State machine (singleton) for nvmutil data.
*/ */
#ifdef __OpenBSD__
#include <sys/param.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@@ -102,18 +99,6 @@ xstatus(int argc, char *argv[])
if (argc < 3) if (argc < 3)
usage(); usage();
/* https://man.openbsd.org/pledge.2
https://man.openbsd.org/unveil.2 */
#if defined(__OpenBSD__) && defined(OpenBSD)
#if (OpenBSD) >= 604
if (pledge("stdio flock rpath wpath cpath unveil", NULL) == -1)
err(errno, "pledge plus unveil");
#elif (OpenBSD) >= 509
if (pledge("stdio flock rpath wpath cpath", NULL) == -1)
err(errno, "pledge");
#endif
#endif
#ifndef S_ISREG #ifndef S_ISREG
err(ECANCELED, "Can't determine file types (S_ISREG undefined)"); err(ECANCELED, "Can't determine file types (S_ISREG undefined)");
#endif #endif
@@ -125,23 +110,12 @@ xstatus(int argc, char *argv[])
err(EINVAL, "Unsupported char size"); err(EINVAL, "Unsupported char size");
#endif #endif
#if defined(__OpenBSD__) && defined(OpenBSD) && \
(OpenBSD) >= 604
/* can only use local tmp on openbsd, due to unveil */
us.f.tname = new_tmpfile(&us.f.tmp_fd, 1, NULL);
#else
us.f.tname = new_tmpfile(&us.f.tmp_fd, 0, NULL); us.f.tname = new_tmpfile(&us.f.tmp_fd, 0, NULL);
#endif
if (us.f.tname == NULL) if (us.f.tname == NULL)
err(errno, "Can't create tmpfile"); err(errno, "Can't create tmpfile");
if (*us.f.tname == '\0') if (*us.f.tname == '\0')
err(errno, "tmp dir is an empty string"); err(errno, "tmp dir is an empty string");
#if defined(__OpenBSD__) && defined(OpenBSD) && \
OpenBSD >= 604
if (unveil(us.f.tname, "rwc") == -1)
err(errno, "unveil rwc: %s", us.f.tname);
#endif
if (fstat(us.f.tmp_fd, &us.f.tmp_st) < 0) if (fstat(us.f.tmp_fd, &us.f.tmp_st) < 0)
err(errno, "%s: stat", us.f.tname); err(errno, "%s: stat", us.f.tname);
@@ -151,26 +125,6 @@ xstatus(int argc, char *argv[])
set_cmd(argc, argv); set_cmd(argc, argv);
set_cmd_args(argc, argv); set_cmd_args(argc, argv);
#if defined(__OpenBSD__) && defined(OpenBSD) && \
(OpenBSD) >= 604
if ((us.cmd[i].flags & O_ACCMODE) == O_RDONLY) {
if (unveil(us.f.fname, "r") == -1)
err(errno, "%s: unveil r", us.f.fname);
} else {
if (unveil(us.f.fname, "rwc") == -1)
err(errno, "%s: unveil rw", us.f.fname);
}
if (unveil(us.f.tname, "rwc") == -1)
err(errno, "%s: unveil rwc", us.f.tname);
if (unveil(NULL, NULL) == -1)
err(errno, "unveil block (rw)");
if (pledge("stdio flock rpath wpath cpath", NULL) == -1)
err(errno, "pledge (kill unveil)");
#endif
open_gbe_file(); open_gbe_file();
memset(us.f.real_buf, 0, sizeof(us.f.real_buf)); memset(us.f.real_buf, 0, sizeof(us.f.real_buf));