3 files changed, 85 insertions, 32 deletions

diff --git a/security/security.c b/security/security.c
index feb18c925349..b7a5a0051807 100644
--- a/security/security.c
+++ b/security/security.c
@@ -384,16 +384,25 @@ void security_sb_free(struct super_block *sb)
         call_void_hook(sb_free_security, sb);
 }
 
-int security_sb_eat_lsm_opts(char *options, struct security_mnt_opts *opts)
+void security_free_mnt_opts(void **mnt_opts)
 {
-        return call_int_hook(sb_eat_lsm_opts, 0, options, opts);
+        if (!*mnt_opts)
+                return;
+        call_void_hook(sb_free_mnt_opts, *mnt_opts);
+        *mnt_opts = NULL;
+}
+EXPORT_SYMBOL(security_free_mnt_opts);
+
+int security_sb_eat_lsm_opts(char *options, void **mnt_opts)
+{
+        return call_int_hook(sb_eat_lsm_opts, 0, options, mnt_opts);
 }
 EXPORT_SYMBOL(security_sb_eat_lsm_opts);
 
 int security_sb_remount(struct super_block *sb,
-                        struct security_mnt_opts *opts)
+                        void *mnt_opts)
 {
-        return call_int_hook(sb_remount, 0, sb, opts);
+        return call_int_hook(sb_remount, 0, sb, mnt_opts);
 }
 EXPORT_SYMBOL(security_sb_remount);
 
@@ -429,13 +438,13 @@ int security_sb_pivotroot(const struct path *old_path, const struct path *new_pa
 }
 
 int security_sb_set_mnt_opts(struct super_block *sb,
-                                struct security_mnt_opts *opts,
+                                void *mnt_opts,
                                 unsigned long kern_flags,
                                 unsigned long *set_kern_flags)
 {
         return call_int_hook(sb_set_mnt_opts,
-                                opts->num_mnt_opts ? -EOPNOTSUPP : 0, sb,
-                                opts, kern_flags, set_kern_flags);
+                                mnt_opts ? -EOPNOTSUPP : 0, sb,
+                                mnt_opts, kern_flags, set_kern_flags);
 }
 EXPORT_SYMBOL(security_sb_set_mnt_opts);
 
@@ -449,9 +458,9 @@ int security_sb_clone_mnt_opts(const struct super_block *oldsb,
 }
 EXPORT_SYMBOL(security_sb_clone_mnt_opts);
 
-int security_sb_parse_opts_str(char *options, struct security_mnt_opts *opts)
+int security_sb_parse_opts_str(char *options, void **mnt_opts)
 {
-        return call_int_hook(sb_parse_opts_str, 0, options, opts);
+        return call_int_hook(sb_parse_opts_str, 0, options, mnt_opts);
 }
 EXPORT_SYMBOL(security_sb_parse_opts_str);
 
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 11cf2feb27b3..caf7ca7abfc1 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -433,6 +433,19 @@ static void superblock_free_security(struct super_block *sb)
         kfree(sbsec);
 }
 
+static void selinux_free_mnt_opts(void *mnt_opts)
+{
+        struct security_mnt_opts *opts = mnt_opts;
+        int i;
+
+        if (opts->mnt_opts)
+                for (i = 0; i < opts->num_mnt_opts; i++)
+                        kfree(opts->mnt_opts[i]);
+        kfree(opts->mnt_opts);
+        kfree(opts->mnt_opts_flags);
+        kfree(opts);
+}
+
 static inline int inode_doinit(struct inode *inode)
 {
         return inode_doinit_with_dentry(inode, NULL);
@@ -616,7 +629,7 @@ static int bad_option(struct superblock_security_struct *sbsec, char flag,
  * labeling information.
  */
 static int selinux_set_mnt_opts(struct super_block *sb,
-                                struct security_mnt_opts *opts,
+                                void *mnt_opts,
                                 unsigned long kern_flags,
                                 unsigned long *set_kern_flags)
 {
@@ -628,9 +641,10 @@ static int selinux_set_mnt_opts(struct super_block *sb,
         struct inode_security_struct *root_isec;
         u32 fscontext_sid = 0, context_sid = 0, rootcontext_sid = 0;
         u32 defcontext_sid = 0;
-        char **mount_options = opts->mnt_opts;
-        int *flags = opts->mnt_opts_flags;
-        int num_opts = opts->num_mnt_opts;
+        struct security_mnt_opts *opts = mnt_opts;
+        char **mount_options = opts ? opts->mnt_opts : NULL;
+        int *flags = opts ? opts->mnt_opts_flags : NULL;
+        int num_opts = opts ? opts->num_mnt_opts : 0;
 
         mutex_lock(&sbsec->lock);
 
@@ -982,12 +996,20 @@ out:
 }
 
 static int selinux_parse_opts_str(char *options,
-                                  struct security_mnt_opts *opts)
+                                  void **mnt_opts)
 {
         char *p;
         char *context = NULL, *defcontext = NULL;
         char *fscontext = NULL, *rootcontext = NULL;
         int rc, num_mnt_opts = 0;
+        struct security_mnt_opts *opts = *mnt_opts;
+
+        if (!opts) {
+                opts = kzalloc(sizeof(struct security_mnt_opts), GFP_KERNEL);
+                *mnt_opts = opts;
+                if (!opts)
+                        return -ENOMEM;
+        }
 
         opts->num_mnt_opts = 0;
 
@@ -1094,7 +1116,7 @@ static int selinux_parse_opts_str(char *options,
         return 0;
 
 out_err:
-        security_free_mnt_opts(opts);
+        security_free_mnt_opts(mnt_opts);
         kfree(context);
         kfree(defcontext);
         kfree(fscontext);
@@ -2714,7 +2736,7 @@ out:
         return rc;
 }
 
-static int selinux_sb_eat_lsm_opts(char *options, struct security_mnt_opts *opts)
+static int selinux_sb_eat_lsm_opts(char *options, void **mnt_opts)
 {
         char *s = (char *)get_zeroed_page(GFP_KERNEL);
         int err;
@@ -2723,14 +2745,14 @@ static int selinux_sb_eat_lsm_opts(char *options, struct security_mnt_opts *opts
                 return -ENOMEM;
         err = selinux_sb_copy_data(options, s);
         if (!err)
-                err = selinux_parse_opts_str(s, opts);
+                err = selinux_parse_opts_str(s, mnt_opts);
         free_page((unsigned long)s);
         return err;
 }
 
-static int selinux_sb_remount(struct super_block *sb,
-                              struct security_mnt_opts *opts)
+static int selinux_sb_remount(struct super_block *sb, void *mnt_opts)
 {
+        struct security_mnt_opts *opts = mnt_opts;
         int i, *flags;
         char **mount_options;
         struct superblock_security_struct *sbsec = sb->s_security;
@@ -2738,6 +2760,9 @@ static int selinux_sb_remount(struct super_block *sb,
         if (!(sbsec->flags & SE_SBINITIALIZED))
                 return 0;
 
+        if (!opts)
+                return 0;
+
         mount_options = opts->mnt_opts;
         flags = opts->mnt_opts_flags;
 
@@ -6782,6 +6807,7 @@ static struct security_hook_list selinux_hooks[] __lsm_ro_after_init = {
         LSM_HOOK_INIT(sb_alloc_security, selinux_sb_alloc_security),
         LSM_HOOK_INIT(sb_free_security, selinux_sb_free_security),
         LSM_HOOK_INIT(sb_eat_lsm_opts, selinux_sb_eat_lsm_opts),
+        LSM_HOOK_INIT(sb_free_mnt_opts, selinux_free_mnt_opts),
         LSM_HOOK_INIT(sb_remount, selinux_sb_remount),
         LSM_HOOK_INIT(sb_kern_mount, selinux_sb_kern_mount),
         LSM_HOOK_INIT(sb_show_options, selinux_sb_show_options),
@@ -7051,11 +7077,7 @@ static __init int selinux_init(void)
 
 static void delayed_superblock_init(struct super_block *sb, void *unused)
 {
-        struct security_mnt_opts opts;
-
-        security_init_mnt_opts(&opts);
-        selinux_set_mnt_opts(sb, &opts, 0, NULL);
-        security_free_mnt_opts(&opts);
+        selinux_set_mnt_opts(sb, NULL, 0, NULL);
 }
 
 void selinux_complete_init(void)
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 835cca277c2a..81a8112975d4 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -567,6 +567,19 @@ static void smack_sb_free_security(struct super_block *sb)
         sb->s_security = NULL;
 }
 
+static void smack_free_mnt_opts(void *mnt_opts)
+{
+        struct security_mnt_opts *opts = mnt_opts;
+        int i;
+
+        if (opts->mnt_opts)
+                for (i = 0; i < opts->num_mnt_opts; i++)
+                        kfree(opts->mnt_opts[i]);
+        kfree(opts->mnt_opts);
+        kfree(opts->mnt_opts_flags);
+        kfree(opts);
+}
+
 /**
  * smack_sb_copy_data - copy mount options data for processing
  * @orig: where to start
@@ -624,8 +637,9 @@ static int smack_sb_copy_data(char *orig, char *smackopts)
  * converts Smack specific mount options to generic security option format
  */
 static int smack_parse_opts_str(char *options,
-                struct security_mnt_opts *opts)
+                void **mnt_opts)
 {
+        struct security_mnt_opts *opts = *mnt_opts;
         char *p;
         char *fsdefault = NULL;
         char *fsfloor = NULL;
@@ -636,11 +650,17 @@ static int smack_parse_opts_str(char *options,
         int num_mnt_opts = 0;
         int token;
 
-        opts->num_mnt_opts = 0;
-
         if (!options)
                 return 0;
 
+        if (!opts) {
+                opts = kzalloc(sizeof(struct security_mnt_opts), GFP_KERNEL);
+                *mnt_opts = opts;
+                if (!opts)
+                        return -ENOMEM;
+        }
+        opts->num_mnt_opts = 0;
+
         while ((p = strsep(&options, ",")) != NULL) {
                 substring_t args[MAX_OPT_ARGS];
 
@@ -735,11 +755,11 @@ out_err:
         kfree(fshat);
         kfree(fsroot);
         kfree(fstransmute);
-        security_free_mnt_opts(opts);
+        security_free_mnt_opts(mnt_opts);
         return rc;
 }
 
-static int smack_sb_eat_lsm_opts(char *options, struct security_mnt_opts *opts)
+static int smack_sb_eat_lsm_opts(char *options, void **mnt_opts)
 {
         char *s = (char *)get_zeroed_page(GFP_KERNEL);
         int err;
@@ -748,7 +768,7 @@ static int smack_sb_eat_lsm_opts(char *options, struct security_mnt_opts *opts)
                 return -ENOMEM;
         err = smack_sb_copy_data(options, s);
         if (!err)
-                err = smack_parse_opts_str(s, opts);
+                err = smack_parse_opts_str(s, mnt_opts);
         free_page((unsigned long)s);
         return err;
 }
@@ -766,7 +786,7 @@ static int smack_sb_eat_lsm_opts(char *options, struct security_mnt_opts *opts)
  * labels.
  */
 static int smack_set_mnt_opts(struct super_block *sb,
-                struct security_mnt_opts *opts,
+                void *mnt_opts,
                 unsigned long kern_flags,
                 unsigned long *set_kern_flags)
 {
@@ -776,7 +796,8 @@ static int smack_set_mnt_opts(struct super_block *sb,
         struct inode_smack *isp;
         struct smack_known *skp;
         int i;
-        int num_opts = opts->num_mnt_opts;
+        struct security_mnt_opts *opts = mnt_opts;
+        int num_opts = opts ? opts->num_mnt_opts : 0;
         int transmute = 0;
 
         if (sp->smk_flags & SMK_SB_INITIALIZED)
@@ -4651,6 +4672,7 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = {
 
         LSM_HOOK_INIT(sb_alloc_security, smack_sb_alloc_security),
         LSM_HOOK_INIT(sb_free_security, smack_sb_free_security),
+        LSM_HOOK_INIT(sb_free_mnt_opts, smack_free_mnt_opts),
         LSM_HOOK_INIT(sb_eat_lsm_opts, smack_sb_eat_lsm_opts),
         LSM_HOOK_INIT(sb_statfs, smack_sb_statfs),
         LSM_HOOK_INIT(sb_set_mnt_opts, smack_set_mnt_opts),