From ebc1c319f6d4de710fd0eaa968625e8b3fb35eaa Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 1 May 2019 01:17:49 +0200 Subject: [PATCH] seccomp: don't commit to an api just yet I'm not sure that I want to be married (to this layout) just yet. Signed-off-by: Christian Brauner --- src/lxc/lxccontainer.h | 15 --------------- src/lxc/lxcseccomp.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h index e2e788993..c367af81a 100644 --- a/src/lxc/lxccontainer.h +++ b/src/lxc/lxccontainer.h @@ -31,11 +31,6 @@ #include -#ifdef SCMP_ACT_USER_NOTIF -#include -#include -#endif - #ifdef __cplusplus extern "C" { #endif @@ -70,16 +65,6 @@ enum { LXC_SECCOMP_NOTIFY_MAX, }; -#ifdef SCMP_ACT_USER_NOTIF -struct seccomp_notify_proxy_msg { - uint32_t version; - struct seccomp_notif req; - struct seccomp_notif_resp resp; - pid_t monitor_pid; - pid_t init_pid; -}; -#endif - /*! * An LXC container. * diff --git a/src/lxc/lxcseccomp.h b/src/lxc/lxcseccomp.h index afb3e7352..97394dfef 100644 --- a/src/lxc/lxcseccomp.h +++ b/src/lxc/lxcseccomp.h @@ -47,7 +47,17 @@ struct lxc_handler; #ifdef HAVE_SECCOMP + #if HAVE_DECL_SECCOMP_NOTIF_GET_FD + +struct seccomp_notify_proxy_msg { + uint32_t version; + struct seccomp_notif req; + struct seccomp_notif_resp resp; + pid_t monitor_pid; + pid_t init_pid; +} __attribute__((packed, aligned(8))); + struct seccomp_notify { bool wants_supervision; int notify_fd; -- 2.47.2