diff options
| author | Chris Wright <chrisw@osdl.org> | 2005-01-03 23:59:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-03 23:59:03 -0800 |
| commit | 85dc4e4f43e3111b0bccf567fe64fb8045a384b2 (patch) | |
| tree | 4baef63be4a7134734982a45b84623a5dd62b0b5 /security | |
| parent | 8606ad0b90f6d01da350d71e374601799a81b69b (diff) | |
[PATCH] fix up dummy security module code merge
OK, somehow I managed to botch this one. It happens to work fine, but I
should have been more careful with forward porting this 1+ year old patch.
The exec-time calc should go in bprm_apply_creds, not bprm_free_security.
Thanks to Stephen for spotting my mistake.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/dummy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/dummy.c b/security/dummy.c index b190ca6cb8ca..ce3deb72a87f 100644 --- a/security/dummy.c +++ b/security/dummy.c @@ -180,7 +180,6 @@ static int dummy_bprm_alloc_security (struct linux_binprm *bprm) static void dummy_bprm_free_security (struct linux_binprm *bprm) { - dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted); return; } @@ -197,6 +196,8 @@ static void dummy_bprm_apply_creds (struct linux_binprm *bprm, int unsafe) current->suid = current->euid = current->fsuid = bprm->e_uid; current->sgid = current->egid = current->fsgid = bprm->e_gid; + + dummy_capget(current, ¤t->cap_effective, ¤t->cap_inheritable, ¤t->cap_permitted); } static int dummy_bprm_set_security (struct linux_binprm *bprm) |