← Back to branch summary

~ubuntu-branches/ubuntu/quantal/apparmor/quantal-updates

« back to all changes in this revision

Viewing changes to kernel-patches/for-mainline/apparmor-audit-deadlock.diff

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2007-03-23 16:42:01 UTC
  • Revision ID: james.westby@ubuntu.com-20070323164201-jkax6f0oku087b7l
Tags: upstream-2.0.1+510.dfsg
Import upstream version 2.0.1+510.dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel-patches/for-mainline/apparmor-audit-deadlock.diff
 
1
Index: b/security/apparmor/lsm.c
 
2
===================================================================
 
3
--- a/security/apparmor/lsm.c
 
4
+++ b/security/apparmor/lsm.c
 
5
@@ -207,7 +207,7 @@ static int apparmor_sb_mount(char *dev_n
 
6
 
 
7
 static int apparmor_umount(struct vfsmount *mnt, int flags)
 
8
 {
 
9
-       return aa_reject_syscall(current, GFP_ATOMIC, "umount");
 
10
+       return aa_reject_syscall(current, GFP_KERNEL, "umount");
 
11
 }
 
12
 
 
13
 static int apparmor_inode_mkdir(struct inode *dir, struct dentry *dentry,