diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-26 18:03:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-26 18:03:40 -0700 |
| commit | 8784cdd9af0e3b6a8a42b538db51d7f1951be956 (patch) | |
| tree | 5161ff08d7d8f7d3baeb2d72f98fc54e8f58654e | |
| parent | cd86a536c81e9300d984327517548ca0652eebf9 (diff) | |
| parent | b1338d199dda6681d9af0297928af0a7eb9cba7b (diff) | |
| download | blackbird-op-linux-8784cdd9af0e3b6a8a42b538db51d7f1951be956.tar.gz blackbird-op-linux-8784cdd9af0e3b6a8a42b538db51d7f1951be956.zip | |
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
| -rw-r--r-- | security/tomoyo/tomoyo.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index 5b481912752a..e42be5c4f055 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c @@ -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. |
