Merge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into next...
authorJames Morris <james.morris@microsoft.com>
Mon, 26 Mar 2018 22:16:31 +0000 (09:16 +1100)
committerJames Morris <james.morris@microsoft.com>
Mon, 26 Mar 2018 22:16:31 +0000 (09:16 +1100)
Pull request from Casey.

security/smack/smack_lsm.c

index feada266532209a5e5e4015e88b71813c7dd82dd..432e5ca4251c8bc3471a1a9c686350001e1c7fb9 100644 (file)
@@ -3429,6 +3429,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
        if (opt_dentry->d_parent == opt_dentry) {
                switch (sbp->s_magic) {
                case CGROUP_SUPER_MAGIC:
+               case CGROUP2_SUPER_MAGIC:
                        /*
                         * The cgroup filesystem is never mounted,
                         * so there's no opportunity to set the mount
@@ -3472,6 +3473,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
        switch (sbp->s_magic) {
        case SMACK_MAGIC:
        case CGROUP_SUPER_MAGIC:
+       case CGROUP2_SUPER_MAGIC:
                /*
                 * Casey says that it's a little embarrassing
                 * that the smack file system doesn't do