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

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

diff --git a/src/patches/suse-2.6.27.31/patches.apparmor/security-symlink.diff b/src/patches/suse-2.6.27.31/patches.apparmor/security-symlink.diff
deleted file mode 100644 (file)
index e855eda..0000000
--- a/src/patches/suse-2.6.27.31/patches.apparmor/security-symlink.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-From: Tony Jones <tonyj@suse.de>
-Subject: Pass struct vfsmount to the inode_symlink 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      |    4 ++--
- security/selinux/hooks.c |    3 ++-
- 5 files changed, 11 insertions(+), 8 deletions(-)
-
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -2358,7 +2358,7 @@ int vfs_symlink(struct inode *dir, struc
-       if (!dir->i_op || !dir->i_op->symlink)
-               return -EPERM;
- 
--      error = security_inode_symlink(dir, dentry, oldname);
-+      error = security_inode_symlink(dir, dentry, mnt, oldname);
-       if (error)
-               return error;
- 
---- a/include/linux/security.h
-+++ b/include/linux/security.h
-@@ -355,6 +355,7 @@ static inline void security_free_mnt_opt
-  *    Check the permission to create a symbolic link to a file.
-  *    @dir contains the inode structure of parent directory of the symbolic link.
-  *    @dentry contains the dentry structure of the symbolic link.
-+ *    @mnt is the vfsmount corresponding to @dentry (may be NULL).
-  *    @old_name contains the pathname of file.
-  *    Return 0 if permission is granted.
-  * @inode_mkdir:
-@@ -1363,8 +1364,8 @@ struct security_operations {
-       int (*inode_link) (struct dentry *old_dentry,
-                          struct inode *dir, struct dentry *new_dentry);
-       int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
--      int (*inode_symlink) (struct inode *dir,
--                            struct dentry *dentry, const char *old_name);
-+      int (*inode_symlink) (struct inode *dir, struct dentry *dentry,
-+                            struct vfsmount *mnt, const char *old_name);
-       int (*inode_mkdir) (struct inode *dir, struct dentry *dentry,
-                           struct vfsmount *mnt, int mode);
-       int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
-@@ -1634,7 +1635,7 @@ int security_inode_link(struct dentry *o
-                        struct dentry *new_dentry);
- int security_inode_unlink(struct inode *dir, struct dentry *dentry);
- int security_inode_symlink(struct inode *dir, struct dentry *dentry,
--                         const char *old_name);
-+                         struct vfsmount *mnt, const char *old_name);
- 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);
-@@ -1999,6 +2000,7 @@ static inline int security_inode_unlink(
- 
- static inline int security_inode_symlink(struct inode *dir,
-                                         struct dentry *dentry,
-+                                        struct vfsmount *mnt,
-                                         const char *old_name)
- {
-       return 0;
---- a/security/capability.c
-+++ b/security/capability.c
-@@ -172,7 +172,7 @@ static int cap_inode_unlink(struct inode
- }
- 
- static int cap_inode_symlink(struct inode *inode, struct dentry *dentry,
--                           const char *name)
-+                           struct vfsmount *mnt, const char *name)
- {
-       return 0;
- }
---- a/security/security.c
-+++ b/security/security.c
-@@ -382,11 +382,11 @@ int security_inode_unlink(struct inode *
- }
- 
- int security_inode_symlink(struct inode *dir, struct dentry *dentry,
--                          const char *old_name)
-+                         struct vfsmount *mnt, const char *old_name)
- {
-       if (unlikely(IS_PRIVATE(dir)))
-               return 0;
--      return security_ops->inode_symlink(dir, dentry, old_name);
-+      return security_ops->inode_symlink(dir, dentry, mnt, old_name);
- }
- 
- int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
---- a/security/selinux/hooks.c
-+++ b/security/selinux/hooks.c
-@@ -2592,7 +2592,8 @@ static int selinux_inode_unlink(struct i
-       return may_link(dir, dentry, MAY_UNLINK);
- }
- 
--static int selinux_inode_symlink(struct inode *dir, struct dentry *dentry, const char *name)
-+static int selinux_inode_symlink(struct inode *dir, struct dentry *dentry,
-+                               struct vfsmount *mnt, const char *name)
- {
-       return may_create(dir, dentry, SECCLASS_LNK_FILE);
- }