All of lore.kernel.org
 help / color / mirror / Atom feed
From: jmorris@namei.org (James Morris)
To: linux-security-module@vger.kernel.org
Subject: [GIT PULL][SECURITY] Smack updates for v4.17
Date: Sun, 8 Apr 2018 09:34:43 +1000 (AEST)	[thread overview]
Message-ID: <alpine.LRH.2.21.1804080930060.1486@namei.org> (raw)

Please pull this update for Smack, via Casey:

"One small change for Automotive Grade Linux."


The following changes since commit 5893ed18a26d1f56b97c0290b0cbbc2d49d6de28:

  Merge tag 'v4.16-rc6' into next-general (2018-03-23 08:26:16 +1100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-smack

for you to fetch changes up to d54d27c9571245e4990bb8d020b109b92115683b:

  Merge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into next-smack (2018-03-27 09:16:31 +1100)

----------------------------------------------------------------
James Morris (1):
      Merge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into next-smack

Jos? Bollo (1):
      Smack: Handle CGROUP2 in the same way that CGROUP

 security/smack/smack_lsm.c | 2 ++
 1 file changed, 2 insertions(+)

---
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index feada26..432e5ca 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

                 reply	other threads:[~2018-04-07 23:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LRH.2.21.1804080930060.1486@namei.org \
    --to=jmorris@namei.org \
    --cc=linux-security-module@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.