Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754650AbbHNAxb (ORCPT ); Thu, 13 Aug 2015 20:53:31 -0400 Received: from mail-qg0-f45.google.com ([209.85.192.45]:34869 "EHLO mail-qg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752973AbbHNAxa (ORCPT ); Thu, 13 Aug 2015 20:53:30 -0400 From: Murilo Opsfelder Araujo To: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Cc: t.vivek@samsung.com, a.sahrawat@samsung.com, casey@schaufler-ca.com, james.l.morris@oracle.com, serge@hallyn.com, Murilo Opsfelder Araujo Subject: [PATCH] security/smack/smack_lsm.c: Fix build error when CONFIG_SECURITY_SMACK_BRINGUP is not defined Date: Thu, 13 Aug 2015 21:52:47 -0300 Message-Id: <1439513567-5347-1-git-send-email-mopsfelder@gmail.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2082 Lines: 59 This change fixes the following build error when CONFIG_SECURITY_SMACK_BRINGUP is not defined: security/smack/smack_lsm.c: In function ‘smack_parse_opts_str’: security/smack/smack_lsm.c:618:26: error: ‘tokens’ undeclared (first use in this function) token = match_token(p, tokens, args); ^ security/smack/smack_lsm.c:618:26: note: each undeclared identifier is reported only once for each function it appears in The above has been introduced by commit 3bf2789cad9e6573dc19a6c3d123c2c049f2d90f "smack: allow mount opts setting over filesystems with binary mount data". Signed-off-by: Murilo Opsfelder Araujo --- security/smack/smack_lsm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 54fb3a1..6201907 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -57,14 +57,6 @@ LIST_HEAD(smk_ipv6_port_list); static struct kmem_cache *smack_inode_cache; int smack_enabled; -#ifdef CONFIG_SECURITY_SMACK_BRINGUP -static char *smk_bu_mess[] = { - "Bringup Error", /* Unused */ - "Bringup", /* SMACK_BRINGUP_ALLOW */ - "Unconfined Subject", /* SMACK_UNCONFINED_SUBJECT */ - "Unconfined Object", /* SMACK_UNCONFINED_OBJECT */ -}; - static const match_table_t tokens = { {Opt_fsdefault, SMK_FSDEFAULT "%s"}, {Opt_fsfloor, SMK_FSFLOOR "%s"}, @@ -74,6 +66,14 @@ static const match_table_t tokens = { {Opt_error, NULL}, }; +#ifdef CONFIG_SECURITY_SMACK_BRINGUP +static char *smk_bu_mess[] = { + "Bringup Error", /* Unused */ + "Bringup", /* SMACK_BRINGUP_ALLOW */ + "Unconfined Subject", /* SMACK_UNCONFINED_SUBJECT */ + "Unconfined Object", /* SMACK_UNCONFINED_OBJECT */ +}; + static void smk_bu_mode(int mode, char *s) { int i = 0; -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/