← Back to branch summary

~sbeattie/apparmor/apparmor-ubuntu-2.6.1-merge

« back to all changes in this revision

Viewing changes to deprecated/kernel-patches/2.6.27/export-security_inode_permission-for-aufs

  • Committer: Jamie Strandboge
  • Date: 2011-02-24 18:04:26 UTC
  • mfrom: (1415.3.4 apparmor-ubuntu-trunk)
  • Revision ID: jamie@canonical.com-20110224180426-q39kzcgsktwx8ixj
Released 2.6.0-0ubuntu1 to natty

[ Steve Beattie ]
* New upstream 2.6.0 release (LP: #724193)
  - Patches taken upstream and dropped:
    + 0001-ubuntu-buildd.patch
    + 0003-add-libvirt-support-to-dnsmasq.patch
    + 0004-lp698194.patch
    + 0005-aa-disable.patch
  - debian/rules: remove library path settings for mod_apparmor and
    pam_apprmor builds; upstream handles this properly now.
  - debian/apparmor-utils.install: handle upstream SubDomain.pm =>
    AppArmor.pm renaming
* debian/lib/apparmor/functions: handle profile names with embedded
  spaces (LP: #655523)
* debian/rules, debian/control, debian/python-libapparmor: build
  a python-libapparmor package.
[ Jamie Strandboge ]
* debian/control: use Section: python for python-libapparmor

Show diffs side-by-side

added added

removed removed

Lines of Context:
deprecated/kernel-patches/2.6.27/export-security_inode_permission-for-aufs
1
 
From: Jeff Mahoney <jeffm@suse.com>
2
 
Subject: [PATCH] LSM: Export security_inode_permission for aufs
3
 
Patch-mainline: Never
4
 
References: 356902
5
 
 
6
 
 In order for aufs to work with AppArmor, it needs to be able to call
7
 
 security_inode_permission itself.
8
 
 
9
 
 This patch is a _workaround_ since the author will need to find a
10
 
 mainline-compatible solution moving forward.
11
 
 
12
 
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
13
 
---
14
 
 security/security.c |    1 +
15
 
 1 file changed, 1 insertion(+)
16
 
 
17
 
--- a/security/security.c
18
 
+++ b/security/security.c
19
 
@@ -415,6 +415,7 @@ int security_inode_mknod(struct inode *d
20
 
                return 0;
21
 
        return security_ops->inode_mknod(dir, dentry, mnt, mode, dev);
22
 
 }
23
 
+EXPORT_SYMBOL_GPL(security_inode_permission);
24
 
 
25
 
 int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
26
 
                          struct vfsmount *old_mnt, struct inode *new_dir,