woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subproc: print syscall number as decimal

Browse Source
This commit is contained in:
Robert Swiecki 2017-10-08 15:02:41 +02:00
parent 85b0908dd8
commit 23a77f46e9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sandbox.c
View File

@ -29,7 +29,7 @@
#include "kafel.h"
#include "log.h"
#ifndef PR_SET_NO_NEW_PRIVS /* in prctl.h since Linux 3.5 */
#ifndef PR_SET_NO_NEW_PRIVS /* in prctl.h since Linux 3.5 */
#define PR_SET_NO_NEW_PRIVS 38
#endif /* PR_SET_NO_NEW_PRIVS */

10
subproc.c
View File

@ -244,7 +244,7 @@ static void subprocSeccompViolation(struct nsjconf_t *nsjconf, siginfo_t * si)
struct pids_t *p = subprocGetPidElem(nsjconf, si->si_pid);
if (p == NULL) {
LOG_W("PID: %d, Syscall number: %#x, Seccomp reason: %#x", (int)si->si_pid,
LOG_W("PID: %d, Syscall number: %d, Seccomp reason: %d", (int)si->si_pid,
si->si_syscall, si->si_errno);
LOG_E("Couldn't find pid element in the subproc list for PID: %d", (int)si->si_pid);
return;
@ -253,7 +253,7 @@ static void subprocSeccompViolation(struct nsjconf_t *nsjconf, siginfo_t * si)
char buf[4096];
ssize_t rdsize = utilReadFromFd(p->pid_syscall_fd, buf, sizeof(buf) - 1);
if (rdsize < 1) {
LOG_W("PID: %d, Syscall number: %#x, Seccomp reason: %#x", (int)si->si_pid,
LOG_W("PID: %d, Syscall number: %d, Seccomp reason: %d", (int)si->si_pid,
si->si_syscall, si->si_errno);
return;
}
@ -266,14 +266,14 @@ static void subprocSeccompViolation(struct nsjconf_t *nsjconf, siginfo_t * si)
&arg5, &arg6, &sp, &pc);
if (ret == 9) {
LOG_W
("PID: %d, Syscall number: %td, Arguments: %#tx, %#tx, %#tx, %#tx, %#tx, %#tx, SP: %#tx, PC: %#tx, si_syscall: %#x, si_errno: %#x",
("PID: %d, Syscall number: %td, Arguments: %#tx, %#tx, %#tx, %#tx, %#tx, %#tx, SP: %#tx, PC: %#tx, si_syscall: %d, si_errno: %#x",
(int)si->si_pid, sc, arg1, arg2, arg3, arg4, arg5, arg6, sp, pc,
si->si_syscall, si->si_errno);
} else if (ret == 3) {
LOG_W("PID: %d, Syscall number: %#x, Seccomp reason: %#x, SP: %#tx, PC: %#tx",
LOG_W("PID: %d, Syscall number: %d, Seccomp reason: %d, SP: %#tx, PC: %#tx",
(int)si->si_pid, si->si_syscall, si->si_errno, arg1, arg2);
} else {
LOG_W("PID: %d, Syscall number: %#x, Seccomp reason: %#x, Syscall string '%s'",
LOG_W("PID: %d, Syscall number: %d, Seccomp reason: %d, Syscall string '%s'",
(int)si->si_pid, si->si_syscall, si->si_errno, buf);
}
}