libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

util/nvmutil: move xpledge/xunveil to nvmutil.h 

They don't precisely *pertain* to nvmutil, but they are
useful helper functions for calling pledge/unveil in
OpenBSD. Ideally, the main file should only contain core
logic pertaining to the execution of *nvmutil*.

Put xpledge() and xunveil() in nvmutil.h.

Signed-off-by: Leah Rowe <leah@libreboot.org>
fsdg20230625
Leah Rowe 2023-06-01 08:40:01 +01:00
parent 9a3e651656
commit 2dabafe691
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
util/nvmutil/nvmutil.c
View File

@ -292,23 +292,3 @@ next_part:
err(ERR(), "%s", filename);
xpledge("stdio", NULL);
}
void
xpledge(const char *promises, const char *execpromises)
{
(void)promises; (void)execpromises;
#ifdef __OpenBSD__
if (pledge(promises, execpromises) == -1)
err(ERR(), "pledge");
#endif
}
void
xunveil(const char *path, const char *permissions)
{
(void)path; (void)permissions;
#ifdef __OpenBSD__
if (unveil(path, permissions) == -1)
err(ERR(), "unveil");
#endif
}

21
util/nvmutil/nvmutil.h
View File

@ -18,8 +18,6 @@ int validChecksum(int partnum);
void setWord(int pos16, int partnum, uint16_t val16);
void xorswap_buf(int n, int partnum);
void writeGbeFile(int *fd, const char *filename, size_t nw);
void xpledge(const char *promises, const char *execpromises);
void xunveil(const char *path, const char *permissions);
#define FILENAME argv[1]
#define COMMAND argv[2]
@ -45,3 +43,22 @@ uint8_t big_endian;
#define xopen(fd, loc, p) if ((fd = open(loc, p)) == -1) err(ERR(), "%s", loc)
#define err_if(x) if (x) err(ERR(), NULL)
void
xpledge(const char *promises, const char *execpromises)
{
(void)promises; (void)execpromises;
#ifdef __OpenBSD__
if (pledge(promises, execpromises) == -1)
err(ERR(), "pledge");
#endif
}
void
xunveil(const char *path, const char *permissions)
{
(void)path; (void)permissions;
#ifdef __OpenBSD__
if (unveil(path, permissions) == -1)
err(ERR(), "unveil");
#endif
}