1 files changed, 5 insertions, 2 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index 0cf4b53480a7..edd3918fac02 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -506,14 +506,17 @@ int cap_bprm_set_creds(struct linux_binprm *bprm)
 skip:
 
         /* Don't let someone trace a set[ug]id/setpcap binary with the revised
-         * credentials unless they have the appropriate permit
+         * credentials unless they have the appropriate permit.
+         *
+         * In addition, if NO_NEW_PRIVS, then ensure we get no new privs.
          */
         if ((new->euid != old->uid ||
              new->egid != old->gid ||
              !cap_issubset(new->cap_permitted, old->cap_permitted)) &&
             bprm->unsafe & ~LSM_UNSAFE_PTRACE_CAP) {
                 /* downgrade; they get no more than they had, and maybe less */
-                if (!capable(CAP_SETUID)) {
+                if (!capable(CAP_SETUID) ||
+                    (bprm->unsafe & LSM_UNSAFE_NO_NEW_PRIVS)) {
                         new->euid = new->uid;
                         new->egid = new->gid;
                 }