From: Eric Paris <eparis@redhat.com>
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-Url: http://git.alex.org.uk

fcaps: clear the same personality flags as suid when fcaps are used

BugLink: http://bugs.launchpad.net/bugs/987337

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---

diff --git a/security/commoncap.c b/security/commoncap.c
index 09a5dbf..6693fe4 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -512,6 +512,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.
 	 *