From 9a3344f9a569de5a2b619ff9ebc01cbd195ee1d0 Mon Sep 17 00:00:00 2001
From: Topi Miettinen <toiwoton@gmail.com>
Date: Fri, 28 Jul 2017 13:50:10 +0300
Subject: Improve seccomp printing

---
 src/fseccomp/seccomp_file.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/fseccomp/seccomp_file.c')

diff --git a/src/fseccomp/seccomp_file.c b/src/fseccomp/seccomp_file.c
index c1e8d406f..c74de9faf 100644
--- a/src/fseccomp/seccomp_file.c
+++ b/src/fseccomp/seccomp_file.c
@@ -37,22 +37,15 @@ static void write_to_file(int fd, void *data, int size) {
 }
 
 void filter_init(int fd) {
-#if defined(__x86_64__)
-#define X32_SYSCALL_BIT 0x40000000
 	struct sock_filter filter[] = {
 		VALIDATE_ARCHITECTURE,
+#if defined(__x86_64__)
 		EXAMINE_SYSCALL,
-		// handle X32 ABI
-		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, X32_SYSCALL_BIT, 1, 0),
-		BPF_JUMP(BPF_JMP+BPF_JGE+BPF_K, 0, 1, 0),
-		RETURN_ERRNO(EPERM)
-	};
+		HANDLE_X32
 #else
-	struct sock_filter filter[] = {
-		VALIDATE_ARCHITECTURE,
 		EXAMINE_SYSCALL
-	};
 #endif
+	};
 
 #if 0
 {
-- 
cgit v1.2.3-70-g09d2