1 files changed, 3 insertions, 2 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index 435d074853f3..f2399d8afbe0 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -76,8 +76,9 @@ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
                 int cap, int audit)
 {
         for (;;) {
-                /* The creator of the user namespace has all caps. */
-                if (targ_ns != &init_user_ns && targ_ns->creator == cred->user)
+                /* The owner of the user namespace has all caps. */
+                if (targ_ns != &init_user_ns && uid_eq(targ_ns->owner,
+                                                       make_kuid(cred->user_ns, cred->euid)))
                         return 0;
 
                 /* Do we have the necessary capabilities? */