From patchwork Mon Nov 2 17:56:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 539071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 96FAF140D98 for ; Tue, 3 Nov 2015 04:57:00 +1100 (AEDT) Received: from localhost ([::1]:43628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtJLm-000146-Bi for incoming@patchwork.ozlabs.org; Mon, 02 Nov 2015 12:56:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtJLV-0000n2-DJ for qemu-devel@nongnu.org; Mon, 02 Nov 2015 12:56:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtJLS-0005z0-64 for qemu-devel@nongnu.org; Mon, 02 Nov 2015 12:56:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtJLS-0005yu-1z for qemu-devel@nongnu.org; Mon, 02 Nov 2015 12:56:38 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 6B26CC0798E5; Mon, 2 Nov 2015 17:56:37 +0000 (UTC) Received: from apm-mustang-ev3-03.lab.eng.brq.redhat.com (apm-mustang-ev3-03.lab.eng.brq.redhat.com [10.34.42.82]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tA2HuZXv020510; Mon, 2 Nov 2015 12:56:35 -0500 From: Andrew Jones To: qemu-devel@nongnu.org Date: Mon, 2 Nov 2015 18:56:34 +0100 Message-Id: <1446486994-29913-1-git-send-email-drjones@redhat.com> In-Reply-To: <1446212690-7656-2-git-send-email-eduardo.otubo@profitbricks.com> References: <1446212690-7656-2-git-send-email-eduardo.otubo@profitbricks.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, eduardo.otubo@profitbricks.com Subject: [Qemu-devel] [PATCH v2] seccomp: add cacheflush to whitelist X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org cacheflush is an arm-specific syscall that qemu built for arm uses. Add it to the whitelist, but only if we're linking with a recent enough libseccomp. Signed-off-by: Andrew Jones --- v2: only add cacheflush if libseccomp supports it qemu-seccomp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qemu-seccomp.c b/qemu-seccomp.c index 80d034a8d5190..e76097e958779 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -16,6 +16,10 @@ #include #include "sysemu/seccomp.h" +#if SCMP_VER_MAJOR >= 2 && SCMP_VER_MINOR >= 2 && SCMP_VER_MICRO >= 3 +#define HAVE_CACHEFLUSH +#endif + struct QemuSeccompSyscall { int32_t num; uint8_t priority; @@ -238,7 +242,10 @@ static const struct QemuSeccompSyscall seccomp_whitelist[] = { { SCMP_SYS(inotify_init1), 240 }, { SCMP_SYS(inotify_add_watch), 240 }, { SCMP_SYS(mbind), 240 }, - { SCMP_SYS(memfd_create), 240 } + { SCMP_SYS(memfd_create), 240 }, +#ifdef HAVE_CACHEFLUSH + { SCMP_SYS(cacheflush), 240 }, +#endif }; int seccomp_start(void)