← Back to branch summary

~apparmor-dev/apparmor/2_3

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/apparmor-builtin-only.diff

  • Committer: jrjohansen
  • Date: 2008-05-27 12:04:33 UTC
  • Revision ID: svn-v4:40609528-9d10-0410-9bd8-e926d5471da9:branches/2_3:1265
remove for-mainline dir from kernel patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel-patches/for-mainline/apparmor-builtin-only.diff
1
 
---
2
 
 security/apparmor/Kconfig |    2 +-
3
 
 security/apparmor/lsm.c   |   26 --------------------------
4
 
 2 files changed, 1 insertion(+), 27 deletions(-)
5
 
 
6
 
--- a/security/apparmor/Kconfig
7
 
+++ b/security/apparmor/Kconfig
8
 
@@ -1,5 +1,5 @@
9
 
 config SECURITY_APPARMOR
10
 
-       tristate "AppArmor support"
11
 
+       bool "AppArmor support"
12
 
        depends on SECURITY
13
 
        select AUDIT
14
 
        help
15
 
--- a/security/apparmor/lsm.c
16
 
+++ b/security/apparmor/lsm.c
17
 
@@ -931,33 +931,7 @@ createfs_out:
18
 
 
19
 
 }
20
 
 
21
 
-static void __exit apparmor_exit(void)
22
 
-{
23
 
-       /* Remove and release all the profiles on the profile list. */
24
 
-       mutex_lock(&aa_interface_lock);
25
 
-       aa_profile_ns_list_release();
26
 
-
27
 
-       /* FIXME: cleanup profiles references on files */
28
 
-       free_default_namespace();
29
 
-
30
 
-       /*
31
 
-        * Delay for an rcu cycle to make sure that all active task
32
 
-        * context readers have finished, and all profiles have been
33
 
-        * freed by their rcu callbacks.
34
 
-        */
35
 
-       synchronize_rcu();
36
 
-
37
 
-       destroy_apparmorfs();
38
 
-       mutex_unlock(&aa_interface_lock);
39
 
-
40
 
-       if (unregister_security(&apparmor_ops))
41
 
-               info_message("Unable to properly unregister AppArmor");
42
 
-
43
 
-       info_message("AppArmor protection removed");
44
 
-}
45
 
-
46
 
 module_init(apparmor_init);
47
 
-module_exit(apparmor_exit);
48
 
 
49
 
 MODULE_DESCRIPTION("AppArmor process confinement");
50
 
 MODULE_AUTHOR("Novell/Immunix, http://bugs.opensuse.org");