Re: [PATCH] security/smack/smack_lsm.c: Fix build error when CONFIG_SECURITY_SMACK_BRINGUP is not defined
On Fri, Aug 14, 2015 at 1:06 AM, Casey Schaufler wrote: > On 8/13/2015 5:52 PM, Murilo Opsfelder Araujo wrote: >> 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 > > 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. -- Murilo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] security/smack/smack_lsm.c: Fix build error when CONFIG_SECURITY_SMACK_BRINGUP is not defined
On Fri, Aug 14, 2015 at 1:06 AM, Casey Schaufler ca...@schaufler-ca.com wrote: On 8/13/2015 5:52 PM, Murilo Opsfelder Araujo wrote: 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 mopsfel...@gmail.com 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. -- Murilo -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] security/smack/smack_lsm.c: Fix build error when CONFIG_SECURITY_SMACK_BRINGUP is not defined
On 8/13/2015 5:52 PM, Murilo Opsfelder Araujo wrote: > 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 I have already made a pull request for an almost identical patch to James' next tree. > --- > 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] 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 --- 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] 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 mopsfel...@gmail.com --- 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] security/smack/smack_lsm.c: Fix build error when CONFIG_SECURITY_SMACK_BRINGUP is not defined
On 8/13/2015 5:52 PM, Murilo Opsfelder Araujo wrote: 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 mopsfel...@gmail.com I have already made a pull request for an almost identical patch to James' next tree. --- 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; -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/