diff options
| author | James Morris <jmorris@namei.org> | 2009-06-09 01:27:53 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-09 01:27:53 +0200 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /security | |
| parent | integrity: ima audit dentry_open failure (diff) | |
| parent | async: Fix lack of boot-time console due to insufficient synchronization (diff) | |
| download | linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.xz linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.zip | |
Merge branch 'master' into next
Diffstat (limited to 'security')
| -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. |