Skip to content

K
Kernel

openeuler / Kernel
接近 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 d54d27c9 编写于 作者: J James Morris
浏览文件
操作

Merge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into next-smack 

Pull request from Casey.
上级 5893ed18 58c442f3
隐藏空白更改
内联 并排
Showing with 2 addition and 0 deletion
security/smack/smack_lsm.c
浏览文件 @ d54d27c9
...@@ -3429,6 +3429,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode) ...@@ -3429,6 +3429,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
if (opt_dentry->d_parent == opt_dentry) { if (opt_dentry->d_parent == opt_dentry) {
switch (sbp->s_magic) { switch (sbp->s_magic) {
case CGROUP_SUPER_MAGIC: case CGROUP_SUPER_MAGIC:
case CGROUP2_SUPER_MAGIC:
/* /*
* The cgroup filesystem is never mounted, * The cgroup filesystem is never mounted,
* so there's no opportunity to set the mount * 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) ...@@ -3472,6 +3473,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode)
switch (sbp->s_magic) { switch (sbp->s_magic) {
case SMACK_MAGIC: case SMACK_MAGIC:
case CGROUP_SUPER_MAGIC: case CGROUP_SUPER_MAGIC:
case CGROUP2_SUPER_MAGIC:
/* /*
* Casey says that it's a little embarrassing * Casey says that it's a little embarrassing
* that the smack file system doesn't do * that the smack file system doesn't do
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或