From patchwork Sat Apr 7 23:34:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Morris X-Patchwork-Id: 10328035 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D7BD86038F for ; Sat, 7 Apr 2018 23:34:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C54542846C for ; Sat, 7 Apr 2018 23:34:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8239286E2; Sat, 7 Apr 2018 23:34:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,T_TVD_MIME_EPI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A92BE2846C for ; Sat, 7 Apr 2018 23:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752291AbeDGXep (ORCPT ); Sat, 7 Apr 2018 19:34:45 -0400 Received: from namei.org ([65.99.196.166]:55842 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752281AbeDGXep (ORCPT ); Sat, 7 Apr 2018 19:34:45 -0400 Received: from localhost (localhost [127.0.0.1]) by namei.org (8.14.4/8.14.4) with ESMTP id w37NYhbv002271; Sat, 7 Apr 2018 23:34:43 GMT Date: Sun, 8 Apr 2018 09:34:43 +1000 (AEST) From: James Morris To: Linus Torvalds cc: linux-security-module@vger.kernel.org, Chad Sellers Subject: [GIT PULL][SECURITY] Smack updates for v4.17 Message-ID: User-Agent: Alpine 2.21 (LRH 202 2017-01-01) MIME-Version: 1.0 Content-ID: Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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