Updated kernel (2.6.27.41).

[ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.apparmor / security-getxattr.diff

diff --git a/src/patches/suse-2.6.27.39/patches.apparmor/security-getxattr.diff b/src/patches/suse-2.6.27.39/patches.apparmor/security-getxattr.diff
deleted file mode 100644 (file)
index 0e98d57..0000000
--- a/src/patches/suse-2.6.27.39/patches.apparmor/security-getxattr.diff
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Tony Jones <tonyj@suse.de>
-Subject: Pass struct vfsmount to the inode_getxattr 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/xattr.c                 |    2 +-
- include/linux/security.h   |   11 +++++++----
- security/capability.c      |    3 ++-
- security/security.c        |    5 +++--
- security/selinux/hooks.c   |    3 ++-
- security/smack/smack_lsm.c |    4 +++-
- 6 files changed, 18 insertions(+), 10 deletions(-)
-
---- a/fs/xattr.c
-+++ b/fs/xattr.c
-@@ -141,7 +141,7 @@ vfs_getxattr(struct dentry *dentry, stru
-       if (error)
-               return error;
- 
--      error = security_inode_getxattr(dentry, name);
-+      error = security_inode_getxattr(dentry, mnt, name);
-       if (error)
-               return error;
- 
---- a/include/linux/security.h
-+++ b/include/linux/security.h
-@@ -446,7 +446,7 @@ static inline void security_free_mnt_opt
-  *    @value identified by @name for @dentry and @mnt.
-  * @inode_getxattr:
-  *    Check permission before obtaining the extended attributes
-- *    identified by @name for @dentry.
-+ *    identified by @name for @dentry and @mnt.
-  *    Return 0 if permission is granted.
-  * @inode_listxattr:
-  *    Check permission before obtaining the list of extended attribute
-@@ -1400,7 +1400,8 @@ struct security_operations {
-                                    struct vfsmount *mnt,
-                                    const char *name, const void *value,
-                                    size_t size, int flags);
--      int (*inode_getxattr) (struct dentry *dentry, const char *name);
-+      int (*inode_getxattr) (struct dentry *dentry, struct vfsmount *mnt,
-+                             const char *name);
-       int (*inode_listxattr) (struct dentry *dentry);
-       int (*inode_removexattr) (struct dentry *dentry, const char *name);
-       int (*inode_need_killpriv) (struct dentry *dentry);
-@@ -1676,7 +1677,8 @@ int security_inode_setxattr(struct dentr
- void security_inode_post_setxattr(struct dentry *dentry, struct vfsmount *mnt,
-                                 const char *name, const void *value,
-                                 size_t size, int flags);
--int security_inode_getxattr(struct dentry *dentry, const char *name);
-+int security_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
-+                          const char *name);
- int security_inode_listxattr(struct dentry *dentry);
- int security_inode_removexattr(struct dentry *dentry, const char *name);
- int security_inode_need_killpriv(struct dentry *dentry);
-@@ -2113,7 +2115,8 @@ static inline void security_inode_post_s
- { }
- 
- static inline int security_inode_getxattr(struct dentry *dentry,
--                      const char *name)
-+                                        struct vfsmount *mnt,
-+                                        const char *name)
- {
-       return 0;
- }
---- a/security/capability.c
-+++ b/security/capability.c
-@@ -241,7 +241,8 @@ static void cap_inode_post_setxattr(stru
- {
- }
- 
--static int cap_inode_getxattr(struct dentry *dentry, const char *name)
-+static int cap_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
-+                            const char *name)
- {
-       return 0;
- }
---- a/security/security.c
-+++ b/security/security.c
-@@ -488,11 +488,12 @@ void security_inode_post_setxattr(struct
-                                         flags);
- }
- 
--int security_inode_getxattr(struct dentry *dentry, const char *name)
-+int security_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
-+                          const char *name)
- {
-       if (unlikely(IS_PRIVATE(dentry->d_inode)))
-               return 0;
--      return security_ops->inode_getxattr(dentry, name);
-+      return security_ops->inode_getxattr(dentry, mnt, name);
- }
- 
- int security_inode_listxattr(struct dentry *dentry)
---- a/security/selinux/hooks.c
-+++ b/security/selinux/hooks.c
-@@ -2796,7 +2796,8 @@ static void selinux_inode_post_setxattr(
-       return;
- }
- 
--static int selinux_inode_getxattr(struct dentry *dentry, const char *name)
-+static int selinux_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
-+                                const char *name)
- {
-       return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
- }
---- a/security/smack/smack_lsm.c
-+++ b/security/smack/smack_lsm.c
-@@ -673,11 +673,13 @@ static void smack_inode_post_setxattr(st
- /*
-  * smack_inode_getxattr - Smack check on getxattr
-  * @dentry: the object
-+ * @mnt: unused
-  * @name: unused
-  *
-  * Returns 0 if access is permitted, an error code otherwise
-  */
--static int smack_inode_getxattr(struct dentry *dentry, const char *name)
-+static int smack_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
-+                              const char *name)
- {
-       return smk_curacc(smk_of_inode(dentry->d_inode), MAY_READ);
- }