summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2015-08-14 17:35:10 +1000
committerJames Morris <james.l.morris@oracle.com>2015-08-14 17:35:10 +1000
commit0e38c35815f50e5a347977d76fb5eb4c3bf020b5 (patch)
tree8c2b25f98f6d413ee9039d20f322c3ff39817f2b /security
parente4fc02f24c223ee8d668bf2d39bb8a2dbd61b40e (diff)
parent3d04c92403d377918c9a3bddab6ee103f0db25dd (diff)
downloadlinux-0e38c35815f50e5a347977d76fb5eb4c3bf020b5.tar.bz2
Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next
Diffstat (limited to 'security')
-rw-r--r--security/smack/smack_lsm.c32
1 files changed, 18 insertions, 14 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 54fb3a1d8953..996c88956438 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -57,15 +57,7 @@ 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 = {
+static const match_table_t smk_mount_tokens = {
{Opt_fsdefault, SMK_FSDEFAULT "%s"},
{Opt_fsfloor, SMK_FSFLOOR "%s"},
{Opt_fshat, SMK_FSHAT "%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;
@@ -599,9 +599,14 @@ static int smack_parse_opts_str(char *options,
struct security_mnt_opts *opts)
{
char *p;
- char *fsdefault = NULL, *fsfloor = NULL;
- char *fshat = NULL, *fsroot = NULL, *fstransmute = NULL;
- int rc = -ENOMEM, num_mnt_opts = 0;
+ char *fsdefault = NULL;
+ char *fsfloor = NULL;
+ char *fshat = NULL;
+ char *fsroot = NULL;
+ char *fstransmute = NULL;
+ int rc = -ENOMEM;
+ int num_mnt_opts = 0;
+ int token;
opts->num_mnt_opts = 0;
@@ -609,13 +614,12 @@ static int smack_parse_opts_str(char *options,
return 0;
while ((p = strsep(&options, ",")) != NULL) {
- int token;
substring_t args[MAX_OPT_ARGS];
if (!*p)
continue;
- token = match_token(p, tokens, args);
+ token = match_token(p, smk_mount_tokens, args);
switch (token) {
case Opt_fsdefault: