Skip to contentSkip to conversation

security/smack/smack_lsm.c: Fix build error when CONFIG_SECURITY_SMACK_BRINGUP is not defined

PATCH In review Murilo Opsfelder Araujo 2 participants 3 messages Aug 14, 2015 – Aug 19, 2015

Subsystems (2)
Security (LSM) Smack security module
lore
Share & tools
lore

Murilo Opsfelder Araujo

author
#0 lore raw

PATCH 1/1 security/smack/smack_lsm.c: Fix build error when CONFIG_SECURITY_SMACK_BRINGUP is not defined

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 <[email protected]>
---
 security/smack/smack_lsm.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
security/smack/smack_lsm.c +8 -8
index 54fb3a1..6201907 100644
@@ -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;
Signature · 1 line
2.1.4
maintainer
#1 lore raw
Quoted 5 lines · Murilo Opsfelder Araujo

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)

Quoted 8 lines
   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 <[email protected]>

I have already made a pull request for an almost identical patch to James' next tree.

Quoted 38 lines
---
 security/smack/smack_lsm.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
security/smack/smack_lsm.c +8 -8
index 54fb3a1..6201907 100644
@@ -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;
author
#2 lore raw
Quoted 10 lines · Casey Schaufler
Quoted 9 lines · Murilo Opsfelder Araujo

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

Quoted 8 lines
Quoted 4 lines

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 <[email protected]>

I have already made a pull request for an almost identical patch to James' next tree.

Thanks for the reply, Casey. The fix has already landed -next tree.

Signature · 1 line
Murilo