rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use fatal instead of err/fprintf+exit 

fatal logs to the correct place, err only on stderr.
This commit is contained in:
Omar Polo 2021-02-11 09:07:28 +00:00
parent 2a911637be
commit 8e56d6adc4
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sandbox.c
View File

@ -24,7 +24,7 @@ void
sandbox()
{
if (cap_enter() == -1)
err(1, "cap_enter");
fatal("cap_enter");
}
#elif defined(__linux__)
@ -113,16 +113,13 @@ sandbox_seccomp_catch_sigsys(void)
act.sa_sigaction = &sandbox_seccomp_violation;
act.sa_flags = SA_SIGINFO;
if (sigaction(SIGSYS, &act, NULL) == -1) {
fprintf(stderr, "%s: sigaction(SIGSYS): %s\n",
if (sigaction(SIGSYS, &act, NULL) == -1)
fatal("%s: sigaction(SIGSYS): %s",
__func__, strerror(errno));
exit(1);
}
if (sigprocmask(SIG_UNBLOCK, &mask, NULL) == -1) {
fprintf(stderr, "%s: sigprocmask(SIGSYS): %s\n",
if (sigprocmask(SIG_UNBLOCK, &mask, NULL) == -1)
fatal("%s: sigprocmask(SIGSYS): %s\n",
__func__, strerror(errno));
exit(1);
}
}
#endif /* SC_DEBUG */
@ -235,17 +232,13 @@ sandbox()
sandbox_seccomp_catch_sigsys();
#endif
if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) == -1) {
fprintf(stderr, "%s: prctl(PR_SET_NO_NEW_PRIVS): %s\n",
if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) == -1)
fatal("%s: prctl(PR_SET_NO_NEW_PRIVS): %s",
__func__, strerror(errno));
exit(1);
}
if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog) == -1) {
fprintf(stderr, "%s: prctl(PR_SET_SECCOMP): %s\n",
if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog) == -1)
fatal("%s: prctl(PR_SET_SECCOMP): %s\n",
__func__, strerror(errno));
exit(1);
}
}
#elif defined(__OpenBSD__)
@ -259,11 +252,11 @@ sandbox()
for (h = hosts; h->domain != NULL; ++h) {
if (unveil(h->dir, "r") == -1)
err(1, "unveil %s for domain %s", h->dir, h->domain);
fatal("unveil %s for domain %s", h->dir, h->domain);
}
if (pledge("stdio recvfd rpath inet", NULL) == -1)
err(1, "pledge");
fatal("pledge");
}
#else