From 030bd37378097b45346eb3d6dfc6fba18718fb29 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Wed, 10 May 2017 07:21:29 -0400 Subject: 32bit plaform fixes --- src/firejail/sandbox.c | 2 ++ src/include/common.h | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 9ecb1c8cc..ecc365895 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c @@ -907,12 +907,14 @@ int sandbox(void* sandbox_arg) { // set seccomp //todo: push it down after drop_privs and/or configuring noroot #ifdef HAVE_SECCOMP // install protocol filter +#ifdef SYS_SOCKET if (cfg.protocol) { if (arg_debug) printf("Install protocol filter: %s\n", cfg.protocol); seccomp_load(RUN_SECCOMP_PROTOCOL); // install filter protocol_filter_save(); // save filter in RUN_PROTOCOL_CFG } +#endif // if a keep list is available, disregard the drop list if (arg_seccomp == 1) { diff --git a/src/include/common.h b/src/include/common.h index 59b7f6213..7067ae68c 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -115,6 +115,10 @@ static inline unsigned long long getticks(void) { unsigned a, d; asm volatile("rdtsc" : "=a" (a), "=d" (d)); return ((unsigned long long)a) | (((unsigned long long)d) << 32); +#elif defined(__i386__) + unsigned long long ret; + __asm__ __volatile__("rdtsc" : "=A" (ret)); + return ret; #else return 0; // not implemented #endif -- cgit v1.2.3-54-g00ecf