Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 706ffc8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bf6879dc d54d27c9

security/smack/smack_lsm.c

+2 −0
Original line number Diff line number Diff line
@@ -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