From patchwork Thu Aug 10 13:17:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9893733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 75E5D60384 for ; Thu, 10 Aug 2017 13:20:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 659A628583 for ; Thu, 10 Aug 2017 13:20:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5710528666; Thu, 10 Aug 2017 13:20:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D131128583 for ; Thu, 10 Aug 2017 13:19:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfnLK-0001VS-NK; Thu, 10 Aug 2017 13:17:42 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfnLJ-0001VL-4x for xen-devel@lists.xen.org; Thu, 10 Aug 2017 13:17:41 +0000 Received: from [85.158.143.35] by server-10.bemta-6.messagelabs.com id E2/43-03582-4FC5C895; Thu, 10 Aug 2017 13:17:40 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRWlGSWpSXmKPExsXitHSDve7nmJ5 IgxtfzCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oy1i+ezFjzlqNg+ZQ5bA+NZti5GTg4JAX+J TY3vmEBsNgF9id0vPoHZIgLqEqc7LrKC2MwC4RJ7j10BqufgEBaIkjjzSh4kzCKgKrHh9n6wc l4BT4n+FV2MECPlJM4f/8kMYgsJqElc67/EDlEjKHFy5hMWiJESEgdfvGCewMg9C0lqFpLUAk amVYwaxalFZalFuoYmeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgaHAAAQ7GK9 vDDjEKMnBpCTKW/ypO1KILyk/pTIjsTgjvqg0J7X4EKMMB4eSBO+G6J5IIcGi1PTUirTMHGBQ wqQlOHiURHjFQdK8xQWJucWZ6RCpU4zGHBtWr//CxPFqwv9vTEIsefl5qVLivPtASgVASjNK8 +AGwaLlEqOslDAvI9BpQjwFqUW5mSWo8q8YxTkYlYR5n4BM4cnMK4Hb9wroFCagUyJ8O0FOKU lESEk1MM65d/3BCa2fL4P37V15ZfUWBaa/h0r2xmzc3jnFPulBvLdAnejJPacuhUwwcbaLnnL hqHfTX53AJnFFje/iAh/3qJ+PWp339cZ/jTeBAvtUpOoXuO3eL3jBetn8mQcs+LSDY5cK6E7m fRD7S7js6oqJAtsbNnnvTzdoLTVccof3OFMDt7rgibNKLMUZiYZazEXFiQCQmfC1kQIAAA== X-Env-Sender: prvs=388e22bb3=Andrew.Cooper3@citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1502371058!63412807!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20742 invoked from network); 10 Aug 2017 13:17:39 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-2.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Aug 2017 13:17:39 -0000 X-IronPort-AV: E=Sophos;i="5.41,353,1498521600"; d="scan'208";a="443316115" From: Andrew Cooper To: Xen-devel Date: Thu, 10 Aug 2017 14:17:36 +0100 Message-ID: <1502371056-11384-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Andrew Cooper , Daniel De Graaf Subject: [Xen-devel] [PATCH] xsm/flask: Fix build following "xsm: correct AVC lookups for two sysctls" X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP avc_current_has_perm() takes 4 arguments, not 3. Spotted by a Travis randconfig run which actually turned XSM on. Signed-off-by: Andrew Cooper Acked-by: Daniel De Graaf --- CC: Daniel De Graaf --- xen/xsm/flask/hooks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 17560b1..9114627 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -815,11 +815,11 @@ static int flask_sysctl(int cmd) case XEN_SYSCTL_get_cpu_levelling_caps: return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, - XEN2__GET_CPU_LEVELLING_CAPS); + XEN2__GET_CPU_LEVELLING_CAPS, NULL); case XEN_SYSCTL_get_cpu_featureset: return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, - XEN2__GET_CPU_FEATURESET); + XEN2__GET_CPU_FEATURESET, NULL); case XEN_SYSCTL_livepatch_op: return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2,