inode_capable(_nolog) -> capable_wrt_inode_uidgid.

[people/arne_f/kernel.git] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index 3d9fe6211a94c35652e433c21160fc779ab8b0dc..2881809bb2badd5d613cc4cef534fe358a701635 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -486,9 +486,10 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
                kgid_has_mapping(ns, inode->i_gid);
 }
 
-bool inode_capable_nolog(const struct inode *inode, int cap)
+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
 {
        struct user_namespace *ns = current_user_ns();
 
-       return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
+       return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
+               kgid_has_mapping(ns, inode->i_gid);
 }