Revert "Move xen patchset to new version's subdir."

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.apparmor / security-mkdir.diff

diff --git a/src/patches/suse-2.6.27.31/patches.apparmor/security-mkdir.diff b/src/patches/suse-2.6.27.31/patches.apparmor/security-mkdir.diff
deleted file mode 100644 (file)
index e9a8cdc..0000000
--- a/src/patches/suse-2.6.27.31/patches.apparmor/security-mkdir.diff
+++ /dev/null
@@ -1,106 +0,0 @@
-From: Tony Jones <tonyj@suse.de>
-Subject: Pass struct vfsmount to the inode_mkdir LSM hook
-
-This is needed for computing pathnames in the AppArmor LSM.
-
-Signed-off-by: Tony Jones <tonyj@suse.de>
-Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
-Signed-off-by: John Johansen <jjohansen@suse.de>
-
----
- fs/namei.c               |    2 +-
- include/linux/security.h |    8 ++++++--
- security/capability.c    |    2 +-
- security/security.c      |    5 +++--
- security/selinux/hooks.c |    3 ++-
- 5 files changed, 13 insertions(+), 7 deletions(-)
-
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -2089,7 +2089,7 @@ int vfs_mkdir(struct inode *dir, struct 
-               return -EPERM;
- 
-       mode &= (S_IRWXUGO|S_ISVTX);
--      error = security_inode_mkdir(dir, dentry, mode);
-+      error = security_inode_mkdir(dir, dentry, mnt, mode);
-       if (error)
-               return error;
- 
---- a/include/linux/security.h
-+++ b/include/linux/security.h
-@@ -362,6 +362,7 @@ static inline void security_free_mnt_opt
-  *    associated with inode strcture @dir.
-  *    @dir containst the inode structure of parent of the directory to be created.
-  *    @dentry contains the dentry structure of new directory.
-+ *    @mnt is the vfsmount corresponding to @dentry (may be NULL).
-  *    @mode contains the mode of new directory.
-  *    Return 0 if permission is granted.
-  * @inode_rmdir:
-@@ -1363,7 +1364,8 @@ struct security_operations {
-       int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
-       int (*inode_symlink) (struct inode *dir,
-                             struct dentry *dentry, const char *old_name);
--      int (*inode_mkdir) (struct inode *dir, struct dentry *dentry, int mode);
-+      int (*inode_mkdir) (struct inode *dir, struct dentry *dentry,
-+                          struct vfsmount *mnt, int mode);
-       int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
-       int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
-                           int mode, dev_t dev);
-@@ -1632,7 +1634,8 @@ int security_inode_link(struct dentry *o
- int security_inode_unlink(struct inode *dir, struct dentry *dentry);
- int security_inode_symlink(struct inode *dir, struct dentry *dentry,
-                          const char *old_name);
--int security_inode_mkdir(struct inode *dir, struct dentry *dentry, int mode);
-+int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
-+                       struct vfsmount *mnt, int mode);
- int security_inode_rmdir(struct inode *dir, struct dentry *dentry);
- int security_inode_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev);
- int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
-@@ -2001,6 +2004,7 @@ static inline int security_inode_symlink
- 
- static inline int security_inode_mkdir(struct inode *dir,
-                                       struct dentry *dentry,
-+                                      struct vfsmount *mnt,
-                                       int mode)
- {
-       return 0;
---- a/security/capability.c
-+++ b/security/capability.c
-@@ -178,7 +178,7 @@ static int cap_inode_symlink(struct inod
- }
- 
- static int cap_inode_mkdir(struct inode *inode, struct dentry *dentry,
--                         int mask)
-+                         struct vfsmount *mnt, int mask)
- {
-       return 0;
- }
---- a/security/security.c
-+++ b/security/security.c
-@@ -389,11 +389,12 @@ int security_inode_symlink(struct inode 
-       return security_ops->inode_symlink(dir, dentry, old_name);
- }
- 
--int security_inode_mkdir(struct inode *dir, struct dentry *dentry, int mode)
-+int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
-+                       struct vfsmount *mnt, int mode)
- {
-       if (unlikely(IS_PRIVATE(dir)))
-               return 0;
--      return security_ops->inode_mkdir(dir, dentry, mode);
-+      return security_ops->inode_mkdir(dir, dentry, mnt, mode);
- }
- 
- int security_inode_rmdir(struct inode *dir, struct dentry *dentry)
---- a/security/selinux/hooks.c
-+++ b/security/selinux/hooks.c
-@@ -2597,7 +2597,8 @@ static int selinux_inode_symlink(struct 
-       return may_create(dir, dentry, SECCLASS_LNK_FILE);
- }
- 
--static int selinux_inode_mkdir(struct inode *dir, struct dentry *dentry, int mask)
-+static int selinux_inode_mkdir(struct inode *dir, struct dentry *dentry,
-+                             struct vfsmount *mnt, int mask)
- {
-       return may_create(dir, dentry, SECCLASS_DIR);
- }