diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-08 02:44:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-08 02:44:33 +0300 |
| commit | 706ffc8c26432432fcd6d8a02708b40852bd0bd2 (patch) | |
| tree | e09278fdedc2dfdeb93ef2bc773d18205d34a74f /security/smack | |
| parent | bf6879dcc483f0aa087afe27d103285daf435951 (diff) | |
| parent | d54d27c9571245e4990bb8d020b109b92115683b (diff) | |
| download | linux-706ffc8c26432432fcd6d8a02708b40852bd0bd2.tar.xz | |
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull smack update from James Morris:
"One small change for Automotive Grade Linux"
* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
Smack: Handle CGROUP2 in the same way that CGROUP
Diffstat (limited to 'security/smack')
| -rw-r--r-- | security/smack/smack_lsm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 57fef8e04658..34e1e649f175 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -3348,6 +3348,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 @@ -3391,6 +3392,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 |