summaryrefslogtreecommitdiff
path: root/security/commoncap.c
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2012-04-17 16:26:54 -0400
committerWilly Tarreau <w@1wt.eu>2012-10-07 23:37:26 +0200
commit39c46db9e053fa49c3e0b878cdb25dbc2f7be48d (patch)
treeba265bcfcbd61f14bc21390ea811c677bcfec889 /security/commoncap.c
parent595cf5bda4ee3944d8c7c45e9e91a9ec15b3181d (diff)
fcaps: clear the same personality flags as suid when fcaps are used
commit d52fc5dde171f030170a6cb78034d166b13c9445 upstream If a process increases permissions using fcaps all of the dangerous personality flags which are cleared for suid apps should also be cleared. Thus programs given priviledge with fcaps will continue to have address space randomization enabled even if the parent tried to disable it to make it easier to attack. Signed-off-by: Eric Paris <eparis@redhat.com> Reviewed-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: James Morris <james.l.morris@oracle.com> Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'security/commoncap.c')
-rw-r--r--security/commoncap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index fe30751a6cd9..30972d69f57a 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -511,6 +511,11 @@ int cap_bprm_set_creds(struct linux_binprm *bprm)
}
skip:
+ /* if we have fs caps, clear dangerous personality flags */
+ if (!cap_issubset(new->cap_permitted, old->cap_permitted))
+ bprm->per_clear |= PER_CLEAR_ON_SETID;
+
+
/* Don't let someone trace a set[ug]id/setpcap binary with the revised
* credentials unless they have the appropriate permit
*/