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

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/aafs-perms.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/apparmorfs.c
2
 
===================================================================
3
 
--- a/security/apparmor/apparmorfs.c
4
 
+++ b/security/apparmor/apparmorfs.c
5
 
@@ -86,14 +86,14 @@ static struct root_entry {
6
 
        int parent_index;
7
 
 } root_entries[] = {
8
 
        /* our root, normally /sys/kernel/security/apparmor */
9
 
-       {SECFS_AA,      S_IFDIR, 0550}, /* DO NOT EDIT/MOVE */
10
 
+       {SECFS_AA,      S_IFDIR, 0555}, /* DO NOT EDIT/MOVE */
11
 
 
12
 
        /* interface for obtaining list of profiles currently loaded */
13
 
        {"profiles",    S_IFREG, 0440, &apparmorfs_profiles_fops,
14
 
                                       NULL},
15
 
 
16
 
        /* interface for obtaining matching features supported */
17
 
-       {"matching",    S_IFREG, 0440, &apparmorfs_matching_fops,
18
 
+       {"matching",    S_IFREG, 0444, &apparmorfs_matching_fops,
19
 
                                       NULL},
20
 
 
21
 
        /* interface for loading/removing/replacing profiles */