Commit 8784cdd9 authored May 26, 2009 by Linus Torvalds

Merge branch 'for-linus' of...

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  tomoyo: add missing call to cap_bprm_set_creds

parents cd86a536 b1338d19

security/tomoyo/tomoyo.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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.