aboutsummaryrefslogtreecommitdiff
path: root/security/smack/smack_lsm.c
diff options
context:
space:
mode:
authorJames Morris <james.morris@microsoft.com>2018-03-27 09:16:31 +1100
committerJames Morris <james.morris@microsoft.com>2018-03-27 09:16:31 +1100
commitd54d27c9571245e4990bb8d020b109b92115683b (patch)
tree6268fdf2653d6296116125f0346582047889a159 /security/smack/smack_lsm.c
parent5893ed18a26d1f56b97c0290b0cbbc2d49d6de28 (diff)
parent58c442f34c77ad80941e3da85cc0738e8e21d4f3 (diff)
downloadlinux-d54d27c9571245e4990bb8d020b109b92115683b.tar.gz
Merge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into next-smack
Pull request from Casey.
Diffstat (limited to 'security/smack/smack_lsm.c')
-rw-r--r--security/smack/smack_lsm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index feada2665322..432e5ca4251c 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -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