[PATCH RESEND v2 12/18] fs: Don't remove suid for CAP_FSETID in s_user_ns
STALE3843d
REVIEWED: 1 (0M)
From: Seth Forshee <hidden>
Date: 2016-01-04 18:03:51
Also in:
dm-devel, linux-bcache, linux-fsdevel, lkml, selinux
Subsystem:
filesystems (vfs and infrastructure), the rest · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds
Revision v2 of 5 in this series; 1 review trailer.
Revisions (5)
Expand the check in should_remove_suid() to keep privileges for CAP_FSETID in s_user_ns rather than init_user_ns. Signed-off-by: Seth Forshee <redacted> Acked-by: Serge Hallyn <redacted> --- fs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/inode.c b/fs/inode.c
index 01c036fe1950..3e7c74da9304 100644
--- a/fs/inode.c
+++ b/fs/inode.c@@ -1684,7 +1684,8 @@ int should_remove_suid(struct dentry *dentry) if (unlikely((mode & S_ISGID) && (mode & S_IXGRP))) kill |= ATTR_KILL_SGID; - if (unlikely(kill && !capable(CAP_FSETID) && S_ISREG(mode))) + if (unlikely(kill && !ns_capable(dentry->d_sb->s_user_ns, CAP_FSETID) && + S_ISREG(mode))) return kill; return 0;
--
1.9.1
------------------------------------------------------------------------------