From patchwork Thu Jul 14 15:58:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9230063 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 4CBAB60572 for ; Thu, 14 Jul 2016 16:01:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E2A427F94 for ; Thu, 14 Jul 2016 16:01:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3335A28285; Thu, 14 Jul 2016 16:01:34 +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 BBC1527F94 for ; Thu, 14 Jul 2016 16:01:33 +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 1bNj2U-00009z-O3; Thu, 14 Jul 2016 15:59:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNj2T-00009n-LW for xen-devel@lists.xen.org; Thu, 14 Jul 2016 15:59:01 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 4A/E4-23871-4C6B7875; Thu, 14 Jul 2016 15:59:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRWlGSWpSXmKPExsXitHSDve6Rbe3 hBrP3Slgs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBkTv95jLNjHX3H62C7mBsZ73F2MnBwSAv4S d55tZwGx2QT0JXa/+MQEYosIqEuc7rjICmIzC4RL7D12ha2LkYNDWMBR4vEsd5Awi4CqxMaLj cwgNq+Ap8SeLf2sECPlJM4f/wkWFxJQk7jWf4kdokZQ4uTMJywQIyUkDr54wQxRzy1x+/RU5g mMPLOQlM1CUraAkWkVo0ZxalFZapGuoaVeUlFmekZJbmJmjq6hgbFebmpxcWJ6ak5iUrFecn7 uJkZgiNQzMDDuYPx93O8QoyQHk5Ior3Z/W7gQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV49YMgJ CRalpqdWpGXmAIMVJi3BwaMkwvtlK1Cat7ggMbc4Mx0idYpRUUqc1xykTwAkkVGaB9cGi5BLj LJSwryMDAwMQjwFqUW5mSWo8q8YxTkYlYR5/4OM58nMK4Gb/gpoMRPQYmtzsMUliQgpqQbGbn eflZOnn13anLoh013FplDXbtbD4K9L14ec+7ZG8JjUf3n9Hyu1Ft7ak8blFOzfu3Xr1HsHVq+ ImROx/49P/i+zXxrh6a/21bpqdsQd+27pNc+yIU3kUsRFSWfT6Ea1Z5bO6e+s7P6+fel14g3j lA+PBPw/2Yje3WizXpIrX6dDrfHqjKdzlFiKMxINtZiLihMBnXNhVosCAAA= X-Env-Sender: prvs=996c6fe0e=Andrew.Cooper3@citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1468511938!50617899!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: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19312 invoked from network); 14 Jul 2016 15:59:00 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 14 Jul 2016 15:59:00 -0000 X-IronPort-AV: E=Sophos;i="5.28,363,1464652800"; d="scan'208";a="373233569" From: Andrew Cooper To: Xen-devel Date: Thu, 14 Jul 2016 16:58:55 +0100 Message-ID: <1468511936-13351-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: Andrew Cooper , Daniel De Graaf Subject: [Xen-devel] [PATCH 1/2] xen/flask: Rename cond_expr.bool to bool_val 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 A subsequent change will introduce C99 bools, at which point 'bool' becomes a type, and ineligible as a variable name. Signed-off-by: Andrew Cooper Acked-by: Daniel De Graaf --- CC: Daniel De Graaf --- xen/xsm/flask/ss/conditional.c | 6 +++--- xen/xsm/flask/ss/conditional.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/xsm/flask/ss/conditional.c b/xen/xsm/flask/ss/conditional.c index 098ddc0..3e58aea 100644 --- a/xen/xsm/flask/ss/conditional.c +++ b/xen/xsm/flask/ss/conditional.c @@ -40,7 +40,7 @@ static int cond_evaluate_expr(struct policydb *p, struct cond_expr *expr) if ( sp == (COND_EXPR_MAXDEPTH - 1) ) return -1; sp++; - s[sp] = p->bool_val_to_struct[cur->bool - 1]->state; + s[sp] = p->bool_val_to_struct[cur->bool_val - 1]->state; break; case COND_NOT: if ( sp < 0 ) @@ -404,7 +404,7 @@ static int expr_isvalid(struct policydb *p, struct cond_expr *expr) return 0; } - if ( expr->bool > p->p_bools.nprim ) + if ( expr->bool_val > p->p_bools.nprim ) { printk("Flask: conditional expressions uses unknown bool.\n"); return 0; @@ -444,7 +444,7 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp) goto err; expr->expr_type = le32_to_cpu(buf[0]); - expr->bool = le32_to_cpu(buf[1]); + expr->bool_val = le32_to_cpu(buf[1]); if ( !expr_isvalid(p, expr) ) { diff --git a/xen/xsm/flask/ss/conditional.h b/xen/xsm/flask/ss/conditional.h index d389ecf..59ac6b4 100644 --- a/xen/xsm/flask/ss/conditional.h +++ b/xen/xsm/flask/ss/conditional.h @@ -30,7 +30,7 @@ struct cond_expr { #define COND_NEQ 7 /* bool != bool */ #define COND_LAST COND_NEQ __u32 expr_type; - __u32 bool; + __u32 bool_val; struct cond_expr *next; };