---

yaml --- r: 299325 b: refs/heads/master c: d52fc5d h: refs/heads/master i: 299323: 96d3519 v: v3
git-mirror · Apr 18, 2012 · dfc138c · dfc138c
1 parent 80a5a2e
commit dfc138c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09c79b60960bdd4b00916219402eabfa5e479c5a
+refs/heads/master: d52fc5dde171f030170a6cb78034d166b13c9445
diff --git a/trunk/security/commoncap.c b/trunk/security/commoncap.c
@@ -505,6 +505,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
 	 */