~ubuntu-branches/ubuntu/wily/apparmor/wily

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/export-profile-list.diff

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2011-04-27 10:38:07 UTC
  • mfrom: (5.1.118 natty)
  • Revision ID: james.westby@ubuntu.com-20110427103807-ym3rhwys6o84ith0
Tags: 2.6.1-2
debian/copyright: clarify for some full organization names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: b/security/apparmor/apparmor.h
2
 
===================================================================
3
 
--- a/security/apparmor/apparmor.h
4
 
+++ b/security/apparmor/apparmor.h
5
 
@@ -119,6 +119,9 @@ struct aa_profile {
6
 
        struct kref count;
7
 
 };
8
 
 
9
 
+extern struct list_head profile_list;
10
 
+extern rwlock_t profile_list_lock;
11
 
+
12
 
 /**
13
 
  * struct aa_task_context - primary label for confined tasks
14
 
  * @profile: the current profile
15
 
Index: b/security/apparmor/list.c
16
 
===================================================================
17
 
--- a/security/apparmor/list.c
18
 
+++ b/security/apparmor/list.c
19
 
@@ -14,8 +14,8 @@
20
 
 #include "inline.h"
21
 
 
22
 
 /* list of all profiles and lock */
23
 
-static LIST_HEAD(profile_list);
24
 
-static rwlock_t profile_list_lock = RW_LOCK_UNLOCKED;
25
 
+LIST_HEAD(profile_list);
26
 
+rwlock_t profile_list_lock = RW_LOCK_UNLOCKED;
27
 
 
28
 
 /* list of all task_contexts and lock */
29
 
 static LIST_HEAD(task_context_list);