Compare commits

..

No commits in common. "65ca546f0697f7a17bd435abd0d77bec26dbf28e" and "36f43076b99e2054de96f112f494a82916377d8c" have entirely different histories.

1 changed files with 5 additions and 5 deletions

View File

@ -1583,11 +1583,12 @@ assert_cc(SCMP_SYS(shmdt) > 0);
int seccomp_memory_deny_write_execute(void) { int seccomp_memory_deny_write_execute(void) {
uint32_t arch; uint32_t arch;
unsigned loaded = 0; int r;
int loaded = 0;
SECCOMP_FOREACH_LOCAL_ARCH(arch) { SECCOMP_FOREACH_LOCAL_ARCH(arch) {
_cleanup_(seccomp_releasep) scmp_filter_ctx seccomp = NULL; _cleanup_(seccomp_releasep) scmp_filter_ctx seccomp = NULL;
int filter_syscall = 0, block_syscall = 0, shmat_syscall = 0, r; int filter_syscall = 0, block_syscall = 0, shmat_syscall = 0;
log_debug("Operating on architecture: %s", seccomp_arch_to_string(arch)); log_debug("Operating on architecture: %s", seccomp_arch_to_string(arch));
@ -1677,13 +1678,12 @@ int seccomp_memory_deny_write_execute(void) {
if (ERRNO_IS_SECCOMP_FATAL(r)) if (ERRNO_IS_SECCOMP_FATAL(r))
return r; return r;
if (r < 0) if (r < 0)
log_debug_errno(r, "Failed to install MemoryDenyWriteExecute= rule for architecture %s, skipping: %m", log_debug_errno(r, "Failed to install MemoryDenyWriteExecute= rule for architecture %s, skipping: %m", seccomp_arch_to_string(arch));
seccomp_arch_to_string(arch));
loaded++; loaded++;
} }
if (loaded == 0) if (loaded == 0)
log_debug("Failed to install any seccomp rules for MemoryDenyWriteExecute=."); log_debug_errno(r, "Failed to install any seccomp rules for MemoryDenyWriteExecute=");
return loaded; return loaded;
} }