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

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/fix-rename-file-type.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/lsm.c
2
 
===================================================================
3
 
--- a/security/apparmor/lsm.c
4
 
+++ b/security/apparmor/lsm.c
5
 
@@ -260,7 +260,8 @@ static int aa_permission(struct inode *i
6
 
 
7
 
                profile = aa_get_profile(current);
8
 
                if (profile) {
9
 
-                       if (inode && S_ISDIR(inode->i_mode))
10
 
+                       struct inode *d_inode = dentry->d_inode;
11
 
+                       if (d_inode && S_ISDIR(d_inode->i_mode))
12
 
                                check |= AA_CHECK_DIR;
13
 
                        error = aa_perm(profile, dentry, mnt, mask, check);
14
 
                }