[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - common/Seccomp.cpp

Jan Holesovsky kendy at collabora.com
Thu May 11 09:56:44 UTC 2017


 common/Seccomp.cpp |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 58eb966f736a77eaabe36a4dcfdcc6f8c45512e0
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue May 2 17:24:44 2017 +0200

    Fix build with older kernel versions.
    
    Change-Id: I28fc6687a42ac428413d644e9fd55870cd5936fa
    Reviewed-on: https://gerrit.libreoffice.org/37478
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index b0709cd6..092f1a5d 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -173,8 +173,12 @@ bool lockdown(Type type)
         KILL_SYSCALL(perf_event_open), // profiling
         KILL_SYSCALL(fanotify_init),
         KILL_SYSCALL(fanotify_mark),
+#ifdef __NR_seccomp
         KILL_SYSCALL(seccomp), // no further fiddling
+#endif
+#ifdef __NR_bpf
         KILL_SYSCALL(bpf),     // no further fiddling
+#endif
 
         // allow the rest.
         BPF_STMT(BPF_RET+BPF_K, SECCOMP_RET_ALLOW)


More information about the Libreoffice-commits mailing list