Added missing Xen Kernel Patches which were not commited because

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

diff --git a/src/patches/suse-2.6.27.31/patches.apparmor/security-listxattr.diff b/src/patches/suse-2.6.27.31/patches.apparmor/security-listxattr.diff
new file mode 100644 (file)
index 0000000..5c7e1d5
--- /dev/null
+++ b/src/patches/suse-2.6.27.31/patches.apparmor/security-listxattr.diff
@@ -0,0 +1,105 @@
+From: Tony Jones <tonyj@suse.de>
+Subject: Pass struct vfsmount to the inode_listxattr 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 |    9 +++++----
+ security/capability.c    |    2 +-
+ security/security.c      |    4 ++--
+ security/selinux/hooks.c |    2 +-
+ 5 files changed, 10 insertions(+), 9 deletions(-)
+
+--- a/fs/xattr.c
++++ b/fs/xattr.c
+@@ -174,7 +174,7 @@ vfs_listxattr(struct dentry *dentry, str
+       struct inode *inode = dentry->d_inode;
+       ssize_t error;
+ 
+-      error = security_inode_listxattr(dentry);
++      error = security_inode_listxattr(dentry, mnt);
+       if (error)
+               return error;
+       error = -EOPNOTSUPP;
+--- a/include/linux/security.h
++++ b/include/linux/security.h
+@@ -450,7 +450,7 @@ static inline void security_free_mnt_opt
+  *    Return 0 if permission is granted.
+  * @inode_listxattr:
+  *    Check permission before obtaining the list of extended attribute
+- *    names for @dentry.
++ *    names for @dentry and @mnt.
+  *    Return 0 if permission is granted.
+  * @inode_removexattr:
+  *    Check permission before removing the extended attribute
+@@ -1402,7 +1402,7 @@ struct security_operations {
+                                    size_t size, int flags);
+       int (*inode_getxattr) (struct dentry *dentry, struct vfsmount *mnt,
+                              const char *name);
+-      int (*inode_listxattr) (struct dentry *dentry);
++      int (*inode_listxattr) (struct dentry *dentry, struct vfsmount *mnt);
+       int (*inode_removexattr) (struct dentry *dentry, const char *name);
+       int (*inode_need_killpriv) (struct dentry *dentry);
+       int (*inode_killpriv) (struct dentry *dentry);
+@@ -1679,7 +1679,7 @@ void security_inode_post_setxattr(struct
+                                 size_t size, int flags);
+ int security_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
+                           const char *name);
+-int security_inode_listxattr(struct dentry *dentry);
++int security_inode_listxattr(struct dentry *dentry, struct vfsmount *mnt);
+ int security_inode_removexattr(struct dentry *dentry, const char *name);
+ int security_inode_need_killpriv(struct dentry *dentry);
+ int security_inode_killpriv(struct dentry *dentry);
+@@ -2121,7 +2121,8 @@ static inline int security_inode_getxatt
+       return 0;
+ }
+ 
+-static inline int security_inode_listxattr(struct dentry *dentry)
++static inline int security_inode_listxattr(struct dentry *dentry,
++                                         struct vfsmount *mnt)
+ {
+       return 0;
+ }
+--- a/security/capability.c
++++ b/security/capability.c
+@@ -247,7 +247,7 @@ static int cap_inode_getxattr(struct den
+       return 0;
+ }
+ 
+-static int cap_inode_listxattr(struct dentry *dentry)
++static int cap_inode_listxattr(struct dentry *dentry, struct vfsmount *mnt)
+ {
+       return 0;
+ }
+--- a/security/security.c
++++ b/security/security.c
+@@ -496,11 +496,11 @@ int security_inode_getxattr(struct dentr
+       return security_ops->inode_getxattr(dentry, mnt, name);
+ }
+ 
+-int security_inode_listxattr(struct dentry *dentry)
++int security_inode_listxattr(struct dentry *dentry, struct vfsmount *mnt)
+ {
+       if (unlikely(IS_PRIVATE(dentry->d_inode)))
+               return 0;
+-      return security_ops->inode_listxattr(dentry);
++      return security_ops->inode_listxattr(dentry, mnt);
+ }
+ 
+ int security_inode_removexattr(struct dentry *dentry, const char *name)
+--- a/security/selinux/hooks.c
++++ b/security/selinux/hooks.c
+@@ -2802,7 +2802,7 @@ static int selinux_inode_getxattr(struct
+       return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
+ }
+ 
+-static int selinux_inode_listxattr(struct dentry *dentry)
++static int selinux_inode_listxattr(struct dentry *dentry, struct vfsmount *mnt)
+ {
+       return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
+ }