[PATCH v3 18/25] commoncap: cap_task_fix_setuid(): handle fsid mappings
From: Christian Brauner <hidden>
Date: 2020-02-18 14:36:01
Also in:
linux-fsdevel, linux-security-module, lkml
Subsystem:
capabilities, security subsystem, the rest · Maintainers:
Serge Hallyn, Paul Moore, James Morris, "Serge E. Hallyn", Linus Torvalds
Switch cap_task_fix_setuid() to lookup fsids in the fsid mappings. If no fsid mappings are setup the behavior is unchanged, i.e. fsids are looked up in the id mappings. Signed-off-by: Christian Brauner <redacted> --- /* v2 */ unchanged /* v3 */ unchanged --- security/commoncap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/commoncap.c b/security/commoncap.c
index 55e6cc24f887..0581c6aa8bdc 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c@@ -1062,7 +1062,7 @@ int cap_task_fix_setuid(struct cred *new, const struct cred *old, int flags) * if not, we might be a bit too harsh here. */ if (!issecure(SECURE_NO_SETUID_FIXUP)) { - kuid_t root_uid = make_kuid(old->user_ns, 0); + kuid_t root_uid = make_kfsuid(old->user_ns, 0); if (uid_eq(old->fsuid, root_uid) && !uid_eq(new->fsuid, root_uid)) new->cap_effective = cap_drop_fs_set(new->cap_effective);
--
2.25.0