From: Eric Paris Date: Tue, 17 Apr 2012 20:26:54 +0000 (-0400) Subject: fcaps: clear the same personality flags as suid when fcaps are used X-Git-Tag: v3.2.16~25 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=f2c309c36d0a433c88534082cb2c3a817d6bd409;p=pandora-kernel.git 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 Reviewed-by: Serge Hallyn Signed-off-by: James Morris Signed-off-by: Greg Kroah-Hartman --- diff --git a/security/commoncap.c b/security/commoncap.c index ee4f8486e5f5..0aee1068170c 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -514,6 +514,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 */