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

lbutils: remove xpledge/xunveil, just call them direct

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-04-21 05:54:50 +01:00
parent 7ff5d925bf
commit 0205c0e6b0
5 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/libreboot-utils/include/common.h
-2
View File
@@ -357,8 +357,6 @@ void write_mac_part(size_t partnum);
size_t page_remain(const void *p);
long pagesize(void);
int xunveilx(const char *path, const char *permissions);
int xpledgex(const char *promises, const char *execpromises);
char *smalloc(char **buf, size_t size);
void *vmalloc(void **buf, size_t size);
size_t slen(const char *scmp, size_t maxlen,
util/libreboot-utils/lib/string.c
-29
View File
@@ -620,32 +620,3 @@ lbsetprogname(char *argv0)
return progname;
}
/* https://man.openbsd.org/pledge.2
https://man.openbsd.org/unveil.2 */
int
xpledgex(const char *promises, const char *execpromises)
{
int saved_errno = errno;
(void) promises, (void) execpromises, (void) saved_errno;
errno = 0;
#ifdef __OpenBSD__
if (pledge(promises, execpromises) == -1)
exitf("pledge");
#endif
reset_caller_errno(0);
return 0;
}
int
xunveilx(const char *path, const char *permissions)
{
int saved_errno = errno;
(void) path, (void) permissions, (void) saved_errno;
errno = 0;
#ifdef __OpenBSD__
if (pledge(promises, execpromises) == -1)
exitf("pledge");
#endif
reset_caller_errno(0);
return 0;
}
util/libreboot-utils/lottery.c
+4 -1
View File
@@ -24,8 +24,11 @@ main(int argc, char **argv)
(void) errhook(exit_cleanup);
(void) lbsetprogname(argv[0]);
#ifdef __OpenBSD__
/* https://man.openbsd.org/pledge.2 */
xpledgex("stdio", NULL);
if (pledge("stdio", NULL) == -1)
exitf("pledge");
#endif
buf = rmalloc(size);
if (!vcmp(buf, buf + (size >> 1), size >> 1))
util/libreboot-utils/mkhtemp.c
+8 -2
View File
@@ -59,8 +59,11 @@ main(int argc, char *argv[])
(void) errhook(exit_cleanup);
(void) lbsetprogname(argv[0]);
#ifdef __OpenBSD__
/* https://man.openbsd.org/pledge.2 */
xpledgex("stdio flock rpath wpath cpath", NULL);
if (pledge("stdio flock rpath wpath cpath", NULL) == -1)
exitf("pledge");
#endif
while ((c =
getopt(argc, argv, "qdp:")) != -1) {
@@ -117,7 +120,10 @@ main(int argc, char *argv[])
tmpdir, template) < 0)
exitf("%s", s);
xpledgex("stdio", NULL);
#ifdef __OpenBSD__
if (pledge("stdio", NULL) == -1)
exitf("pledge");
#endif
if (s == NULL)
exitf("bad string initialisation");
util/libreboot-utils/nvmutil.c
+21 -9
View File
@@ -38,10 +38,14 @@ main(int argc, char *argv[])
(void) errhook(exit_cleanup);
#ifdef __OpenBSD
/* https://man.openbsd.org/pledge.2 */
/* https://man.openbsd.org/unveil.2 */
xpledgex("stdio flock rpath wpath cpath unveil", NULL);
xunveilx("/dev/urandom", "r");
if (pledge("stdio flock rpath wpath cpath unveil", NULL) == -1)
exitf("pledge");
if (unveil("/dev/urandom", "r") == -1)
exitf("unveil");
#endif
#ifndef S_ISREG
exitf(
@@ -62,14 +66,22 @@ main(int argc, char *argv[])
cmd = &x->cmd[x->i];
f = &x->f;
if ((cmd->flags & O_ACCMODE) == O_RDONLY)
xunveilx(f->fname, "r");
else
xunveilx(f->fname, "rwc");
#ifdef __OpenBSD__
if ((cmd->flags & O_ACCMODE) == O_RDONLY) {
if (unveil(f->fname, "r") == -1)
exitf("unveil");
} else {
if (unveil(f->fname, "rwc") == -1)
exitf("unveil");
}
xunveilx(f->tname, "rwc");
xunveilx(NULL, NULL);
xpledgex("stdio flock rpath wpath cpath", NULL);
if (unveil(f->tname, "rwc") == -1)
exitf("unveil");
if (unveil(NULL, NULL) == -1)
exitf("unveil");
if (pledge("stdio flock rpath wpath cpath", NULL) == -1)
exitf("pledge");
#endif
if (cmd->run == NULL)
exitf("Command not set");