coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-19 00:03:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: split unveil code to new function

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-02 12:16:30 +00:00
parent 9c23eac148
commit 6de3968f2b
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+23 -11
View File
@@ -23,6 +23,10 @@ void cmd_setchecksum(void), cmd_brick(void), swap(int partnum), writeGbe(void),
int goodChecksum(int partnum); int goodChecksum(int partnum);
uint8_t hextonum(char chs), rhex(void); uint8_t hextonum(char chs), rhex(void);
#ifdef __OpenBSD__
void block_unveil(void);
#endif
#define COMMAND argv[2] #define COMMAND argv[2]
#define MAC_ADDRESS argv[3] #define MAC_ADDRESS argv[3]
#define PARTN argv[3] #define PARTN argv[3]
@@ -97,17 +101,7 @@ main(int argc, char *argv[])
checkdir(fname); checkdir(fname);
#ifdef __OpenBSD__ #ifdef __OpenBSD__
err_if(unveil("/dev/urandom", "r") == -1); block_unveil();
if (flags == O_RDONLY) {
err_if(unveil(fname, "r") == -1);
err_if(unveil(NULL, NULL) == -1);
err_if(pledge("stdio rpath", NULL) == -1);
} else {
err_if(unveil(fname, "rw") == -1);
err_if(unveil(NULL, NULL) == -1);
err_if(pledge("stdio rpath wpath", NULL) == -1);
}
#endif #endif
openFiles(fname); openFiles(fname);
@@ -442,6 +436,24 @@ swap(int partnum)
} }
} }
#ifdef __OpenBSD__
void
block_unveil(void)
{
err_if(unveil("/dev/urandom", "r") == -1);
if (flags == O_RDONLY) {
err_if(unveil(fname, "r") == -1);
err_if(unveil(NULL, NULL) == -1);
err_if(pledge("stdio rpath", NULL) == -1);
} else {
err_if(unveil(fname, "rw") == -1);
err_if(unveil(NULL, NULL) == -1);
err_if(pledge("stdio rpath wpath", NULL) == -1);
}
}
#endif
void void
usage(char *util) usage(char *util)
{ {