From patchwork Mon Apr 4 08:29:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hogan X-Patchwork-Id: 605755 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 3qdlXv6qCbz9sC4 for ; Mon, 4 Apr 2016 18:30:07 +1000 (AEST) Received: from localhost ([::1]:57241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amztd-0000cM-Vr for incoming@patchwork.ozlabs.org; Mon, 04 Apr 2016 04:30:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amztE-0008KC-T4 for qemu-devel@nongnu.org; Mon, 04 Apr 2016 04:29:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amztD-0003rH-6z for qemu-devel@nongnu.org; Mon, 04 Apr 2016 04:29:40 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:20133) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amztD-0003qd-13 for qemu-devel@nongnu.org; Mon, 04 Apr 2016 04:29:39 -0400 Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Websense Email Security Gateway with ESMTPS id 30DF9B9235316; Mon, 4 Apr 2016 09:29:32 +0100 (IST) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by HHMAIL01.hh.imgtec.org (10.100.10.19) with Microsoft SMTP Server (TLS) id 14.3.266.1; Mon, 4 Apr 2016 09:29:34 +0100 Received: from jhogan-linux.le.imgtec.org (192.168.154.110) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.266.1; Mon, 4 Apr 2016 09:29:33 +0100 From: James Hogan To: Date: Mon, 4 Apr 2016 09:29:15 +0100 Message-ID: <1459758556-4557-2-git-send-email-james.hogan@imgtec.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1459758556-4557-1-git-send-email-james.hogan@imgtec.com> References: <1459758556-4557-1-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [192.168.154.110] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.59.15.196 Cc: James Hogan , Aurelien Jarno , Eduardo Otubo Subject: [Qemu-devel] [PATCH 1/2] seccomp: Whitelist cacheflush since 2.2.0 not 2.2.3 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 The cacheflush system call (found on MIPS and ARM) has been included in the libseccomp header since 2.2.0, so include include it back to that version. Previously it was only enabled since 2.2.3 since that is when it was enabled properly for ARM. This will allow seccomp support to be enabled for MIPS back to libseccomp 2.2.0. Signed-off-by: James Hogan Cc: Eduardo Otubo Cc: Aurelien Jarno Reviewed-By: Andrew Jones --- qemu-seccomp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qemu-seccomp.c b/qemu-seccomp.c index 2866e3c2a660..9425dac17155 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -18,9 +18,7 @@ #if SCMP_VER_MAJOR >= 3 #define HAVE_CACHEFLUSH -#elif SCMP_VER_MAJOR == 2 && SCMP_VER_MINOR >= 3 - #define HAVE_CACHEFLUSH -#elif SCMP_VER_MAJOR == 2 && SCMP_VER_MINOR == 2 && SCMP_VER_MICRO >= 3 +#elif SCMP_VER_MAJOR == 2 && SCMP_VER_MINOR >= 2 #define HAVE_CACHEFLUSH #endif