kernel-apparmor-common.patch

   1 ===
   2 === apparmor api in vserver addons
   3 ===
   4 --- i/fs/namei.c        2008-10-29 15:18:09.918901818 +0100
   5 +++ i/fs/namei.c~       2008-10-29 15:16:48.000000000 +0100
   6 @@ -3212,8 +3212,8 @@
   7                 new_path.dentry->d_name.len,
   8                 old_path.dentry->d_name.len, old_path.dentry->d_name.name,
   9                 old_path.dentry->d_name.len);
  10 -       ret = vfs_rename(dir_nd.path.dentry->d_inode, new_path.dentry,
  11 -               old_nd.path.dentry->d_parent->d_inode, old_path.dentry);
  12 +       ret = vfs_rename(dir_nd.path.dentry->d_inode, new_path.dentry, new_path.mnt,
  13 +               old_nd.path.dentry->d_parent->d_inode, old_path.dentry, old_path.mnt);
  14         vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret);
  15         res = new_path.dentry;
  16
  17 @@ -3238,7 +3238,7 @@
  18                 goto out_redo;
  19
  20         /* error path cleanup */
  21 -       vfs_unlink(dir->d_inode, new_path.dentry);
  22 +       vfs_unlink(dir->d_inode, new_path.dentry, new_path.mnt);
  23         dput(new_path.dentry);
  24
  25  out_redo:
  26 ===
  27 === we add this export in small_fixes.patch with regard to unionfs
  28 ===
  29 --- i/security/security.c~      2008-10-29 15:38:27.000000000 +0100
  30 +++ i/security/security.c       2008-10-29 15:45:30.761065898 +0100
  31 @@ -415,7 +415,6 @@ int security_inode_mknod(struct inode *d
  32                 return 0;
  33         return security_ops->inode_mknod(dir, dentry, mnt, mode, dev);
  34  }
  35 -EXPORT_SYMBOL_GPL(security_inode_permission);
  36
  37  int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
  38                           struct vfsmount *old_mnt, struct inode *new_dir,
  39 ===
  40 === support for security= in cmdline
  41 ===
  42 --- i/security/apparmor/lsm.c~  2008-10-31 14:35:08.000000000 +0100
  43 +++ i/security/apparmor/lsm.c   2008-10-31 15:00:32.222153300 +0100
  44 @@ -988,6 +988,9 @@ void info_message(const char *str)
  45  static int __init apparmor_init(void)
  46  {
  47         int error;
  48 +
  49 +       if (!security_module_enable(&apparmor_ops))
  50 +                       return 0;
  51
  52         if (!apparmor_enabled) {
  53                 info_message("AppArmor disabled by boottime parameter\n");