From 470176905d3bfcb3e34058490a52e135dfed4df6 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Tue, 19 Jan 2021 10:29:26 -0300 Subject: [PATCH] lxc: fix build without seccomp if libseccomp built This fixes compiling lxc without seccomp support if libseccomp is already installed to the staging dir. Patches were applied upstream. Signed-off-by: Eneas U de Queiroz --- utils/lxc/Makefile | 2 +- ...fix-check-for-seccomp-notify-support.patch | 34 +++++++++++++++ ...p-libseccomp-tests-if-it-is-disabled.patch | 43 +++++++++++++++++++ 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch create mode 100644 utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index 6f4dd8fc6..7cdc8abe2 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lxc PKG_VERSION:=4.0.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ diff --git a/utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch b/utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch new file mode 100644 index 000000000..a02107aa0 --- /dev/null +++ b/utils/lxc/patches/030-commands-fix-check-for-seccomp-notify-support.patch @@ -0,0 +1,34 @@ +From a342b11fedb3010630de4909ca707ebdc0862060 Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz +Date: Fri, 25 Dec 2020 13:54:14 -0300 +Subject: [PATCH 1/2] commands: fix check for seccomp notify support + +Use HAVE_SECCOMP_NOTIFY instead of HAVE_DECL_SECCOMP_NOTIFY_FD. +Currently the latter will be true if the declaration is found by +configure, even if 'configure --disable-seccomp' is used. + +HAVE_SECCOMP_NOTIFY is defined in lxcseccomp.h if both HAVE_SECCOMP and +HAVE_DECL_SECCOMP_NOTIFY_FD are true, which is the correct behavior. + +Signed-off-by: Eneas U de Queiroz + +--- a/src/lxc/commands.c ++++ b/src/lxc/commands.c +@@ -498,7 +498,7 @@ static int lxc_cmd_get_devpts_fd_callbac + + int lxc_cmd_get_seccomp_notify_fd(const char *name, const char *lxcpath) + { +-#if HAVE_DECL_SECCOMP_NOTIFY_FD ++#ifdef HAVE_SECCOMP_NOTIFY + int ret, stopped; + struct lxc_cmd_rr cmd = { + .req = { +@@ -523,7 +523,7 @@ static int lxc_cmd_get_seccomp_notify_fd + struct lxc_handler *handler, + struct lxc_epoll_descr *descr) + { +-#if HAVE_DECL_SECCOMP_NOTIFY_FD ++#ifdef HAVE_SECCOMP_NOTIFY + struct lxc_cmd_rsp rsp = { + .ret = 0, + }; diff --git a/utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch b/utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch new file mode 100644 index 000000000..2a455bcee --- /dev/null +++ b/utils/lxc/patches/035-configure-skip-libseccomp-tests-if-it-is-disabled.patch @@ -0,0 +1,43 @@ +From 67cd8bde2d46983df8fa9f647e9fc0b96370ec29 Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz +Date: Sat, 16 Jan 2021 13:54:07 -0300 +Subject: [PATCH 2/2] configure: skip libseccomp tests if it is disabled + +Move the block checking for libseccomp api compatibility inside +AM_COND_IF([ENABLE_SECCOMP] ... ). + +Signed-off-by: Eneas U de Queiroz + +--- a/configure.ac ++++ b/configure.ac +@@ -284,6 +284,14 @@ AM_COND_IF([ENABLE_SECCOMP], + AC_CHECK_LIB([seccomp], [seccomp_init],[],[AC_MSG_ERROR([You must install the seccomp development package in order to compile lxc])]) + AC_SUBST([SECCOMP_LIBS], [-lseccomp]) + ]) ++ # HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0 ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $SECCOMP_CFLAGS" ++ AC_CHECK_TYPES([scmp_filter_ctx], [], [], [[#include ]]) ++ AC_CHECK_DECLS([seccomp_notify_fd], [], [], [[#include ]]) ++ AC_CHECK_TYPES([struct seccomp_notif_sizes], [], [], [[#include ]]) ++ AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [], [[#include ]]) ++ CFLAGS="$OLD_CFLAGS" + ]) + + AC_MSG_CHECKING(for static libcap) +@@ -331,15 +339,6 @@ AM_COND_IF([ENABLE_CAP], + AC_CHECK_LIB(cap,cap_get_file, AC_DEFINE(LIBCAP_SUPPORTS_FILE_CAPABILITIES,1,[Have cap_get_file]),[],[]) + AC_SUBST([CAP_LIBS], [-lcap])]) + +-# HAVE_SCMP_FILTER_CTX=1 will tell us we have libseccomp api >= 1.0.0 +-OLD_CFLAGS="$CFLAGS" +-CFLAGS="$CFLAGS $SECCOMP_CFLAGS" +-AC_CHECK_TYPES([scmp_filter_ctx], [], [], [[#include ]]) +-AC_CHECK_DECLS([seccomp_notify_fd], [], [], [[#include ]]) +-AC_CHECK_TYPES([struct seccomp_notif_sizes], [], [], [[#include ]]) +-AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [], [[#include ]]) +-CFLAGS="$OLD_CFLAGS" +- + AC_CHECK_HEADERS([linux/bpf.h], [ + AC_CHECK_TYPES([struct bpf_cgroup_dev_ctx], [], [], [[#include ]]) + ], [], [])