summaryrefslogtreecommitdiff
path: root/security/tomoyo
diff options
context:
space:
mode:
authorHerton Ronaldo Krzesinski <herton@mandriva.com.br>2009-05-26 12:15:53 +0900
committerJames Morris <jmorris@namei.org>2009-05-27 09:46:48 +1000
commitb1338d199dda6681d9af0297928af0a7eb9cba7b (patch)
treebdfcdf710df69eed78e7c4a2b86383ec3db9a230 /security/tomoyo
parente2a1b9ee2335c35e0e34c88a024481b194b3c9cc (diff)
downloadlinux-3.10-b1338d199dda6681d9af0297928af0a7eb9cba7b.tar.gz
linux-3.10-b1338d199dda6681d9af0297928af0a7eb9cba7b.tar.bz2
linux-3.10-b1338d199dda6681d9af0297928af0a7eb9cba7b.zip
tomoyo: add missing call to cap_bprm_set_creds
cap_bprm_set_creds() has to be called from security_bprm_set_creds(). TOMOYO forgot to call cap_bprm_set_creds() from tomoyo_bprm_set_creds() and suid executables were not being working. Make sure we call cap_bprm_set_creds() with TOMOYO, to set credentials properly inside tomoyo_bprm_set_creds(). Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br> Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/tomoyo')
-rw-r--r--security/tomoyo/tomoyo.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index 5b481912752..e42be5c4f05 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.