Merge branch 'master' into next

2009-06-09 09:27:53 +10:00
parent 04288f4203 3af968e066
commit 0b4ec6e4e0
353 changed files with 12683 additions and 1550 deletions
@@ -27,6 +27,12 @@ static int tomoyo_cred_prepare(struct cred *new, const struct cred *old,

 static int tomoyo_bprm_set_creds(struct linux_binprm *bprm)
 {
+	int rc;
+
+	rc = cap_bprm_set_creds(bprm);
+	if (rc)
+		return rc;
+
 	/*
 	 * Do only if this function is called for the first time of an execve
 	 * operation.