/[linux-patches]/genpatches-2.6/historical/2.6.10/1106_capabilities-module-fix-2.patch
Gentoo

Contents of /genpatches-2.6/historical/2.6.10/1106_capabilities-module-fix-2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2 - (show annotations) (download) (as text)
Sat Jun 11 23:16:54 2005 UTC (15 years ago) by dsd
File MIME type: text/x-diff
File size: 1368 byte(s)
Import historical releases
1 # This is a BitKeeper generated diff -Nru style patch.
2 #
3 # ChangeSet
4 # 2005/01/04 15:59:03-08:00 chrisw@osdl.org
5 # [PATCH] fix up dummy security module code merge
6 #
7 # OK, somehow I managed to botch this one. It happens to work fine, but I
8 # should have been more careful with forward porting this 1+ year old patch.
9 # The exec-time calc should go in bprm_apply_creds, not bprm_free_security.
10 #
11 # Thanks to Stephen for spotting my mistake.
12 #
13 # Signed-off-by: Chris Wright <chrisw@osdl.org>
14 # Signed-off-by: Linus Torvalds <torvalds@osdl.org>
15 #
16 # security/dummy.c
17 # 2005/01/04 14:45:31-08:00 chrisw@osdl.org +2 -1
18 # fix up dummy security module code merge
19 #
20 diff -Nru a/security/dummy.c b/security/dummy.c
21 --- a/security/dummy.c 2005-01-04 16:41:40 -08:00
22 +++ b/security/dummy.c 2005-01-04 16:41:40 -08:00
23 @@ -180,7 +180,6 @@
24
25 static void dummy_bprm_free_security (struct linux_binprm *bprm)
26 {
27 - dummy_capget(current, &current->cap_effective, &current->cap_inheritable, &current->cap_permitted);
28 return;
29 }
30
31 @@ -197,6 +196,8 @@
32
33 current->suid = current->euid = current->fsuid = bprm->e_uid;
34 current->sgid = current->egid = current->fsgid = bprm->e_gid;
35 +
36 + dummy_capget(current, &current->cap_effective, &current->cap_inheritable, &current->cap_permitted);
37 }
38
39 static int dummy_bprm_set_security (struct linux_binprm *bprm)

  ViewVC Help
Powered by ViewVC 1.1.20