1 files changed, 3 insertions, 2 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index 6d4d586b9356..78b37838a2d3 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -548,9 +548,10 @@ skip:
 
         if ((is_setid ||
              !cap_issubset(new->cap_permitted, old->cap_permitted)) &&
-            bprm->unsafe & ~LSM_UNSAFE_PTRACE_CAP) {
+            ((bprm->unsafe & ~LSM_UNSAFE_PTRACE) ||
+             !ptracer_capable(current, new->user_ns))) {
                 /* downgrade; they get no more than they had, and maybe less */
-                if (!capable(CAP_SETUID) ||
+                if (!ns_capable(new->user_ns, CAP_SETUID) ||
                     (bprm->unsafe & LSM_UNSAFE_NO_NEW_PRIVS)) {
                         new->euid = new->uid;
                         new->egid = new->gid;