From ea1a9bc786133336d63b3da7e98896b575ad435f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 2 Mar 2026 16:57:50 +0000 Subject: util/nvmutil: bring pledge in set_io_flag to main in general, we should ensure that the pledge calls only happen inside main. this means we can more easily see them, in future re-factoring. Signed-off-by: Leah Rowe --- util/nvmutil/nvmutil.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'util') diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index 27c50bf5..153ac2be 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -87,6 +87,10 @@ main(int argc, char *argv[]) fname = argv[1]; set_io_flags(argc, argv); +#ifdef __OpenBSD__ + if (flags == O_RDONLY) + err_if(pledge("stdio rpath unveil", NULL) == -1); +#endif checkdir("/dev/urandom"); checkdir(fname); #ifdef __OpenBSD__ @@ -148,10 +152,6 @@ set_io_flags(int argc, char *argv[]) if (argc > 2) if (strcmp(COMMAND, "dump") == 0) flags = O_RDONLY; -#ifdef __OpenBSD__ - if (flags == O_RDONLY) - err_if(pledge("stdio rpath unveil", NULL) == -1); -#endif } void -- cgit v1.2.1