BACKPORT: smack: parse mnt opts after privileges check

In smack_set_mnt_opts()first the SMACK mount options are being
parsed and later it is being checked whether the user calling
mount has CAP_MAC_ADMIN capability.
This sequence of operationis will allow unauthorized user to add
SMACK labels in label list and may cause denial of security attack
by adding many labels by allocating kernel memory by unauthorized user.
Superblock smack flag is also being set as initialized though function
may return with EPERM error.
First check the capability of calling user then set the SMACK attributes
and smk_flags.

Signed-off-by: Himanshu Shukla <himanshu.sh@samsung.com>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
(cherry-picked from upstream 2097f59920ea81516d7783396683cad22c26d140)

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index f5046e27a3242658236150f0d4c7c4e35312f58a..23658ac8b16370f7cf4c1b3a5bce8946dc189be3 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -769,6 +769,20 @@ static int smack_set_mnt_opts(struct super_block *sb,
        if (sp->smk_initialized)
                return 0;
 
+       if (!smack_privileged(CAP_MAC_ADMIN)) {
+               /*
+                * Unprivileged mounts don't get to specify Smack values.
+                */
+               if (num_opts)
+                       return -EPERM;
+               /*
+                * Unprivileged mounts get root and default from the caller.
+                */
+               skp = smk_of_current();
+               sp->smk_root = skp;
+               sp->smk_default = skp;
+       }
+
        sp->smk_initialized = 1;
 
        for (i = 0; i < num_opts; i++) {
@@ -809,20 +823,6 @@ static int smack_set_mnt_opts(struct super_block *sb,
                }
        }
 
-       if (!smack_privileged(CAP_MAC_ADMIN)) {
-               /*
-                * Unprivileged mounts don't get to specify Smack values.
-                */
-               if (num_opts)
-                       return -EPERM;
-               /*
-                * Unprivileged mounts get root and default from the caller.
-                */
-               skp = smk_of_current();
-               sp->smk_root = skp;
-               sp->smk_default = skp;
-       }
-
        /*
         * Initialize the root inode.
         */