mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-05 08:45:22 +00:00
83 lines
3.0 KiB
Diff
83 lines
3.0 KiB
Diff
Pass struct vfsmount to the inode_listxattr LSM hook
|
|
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
|
|
|
Index: linux-2.6.19/fs/xattr.c
|
|
===================================================================
|
|
--- linux-2.6.19.orig/fs/xattr.c
|
|
+++ linux-2.6.19/fs/xattr.c
|
|
@@ -150,7 +150,7 @@ vfs_listxattr(struct vfsmount *mnt, stru
|
|
struct inode *inode = dentry->d_inode;
|
|
ssize_t error;
|
|
|
|
- error = security_inode_listxattr(dentry);
|
|
+ error = security_inode_listxattr(mnt, dentry);
|
|
if (error)
|
|
return error;
|
|
error = -EOPNOTSUPP;
|
|
Index: linux-2.6.19/include/linux/security.h
|
|
===================================================================
|
|
--- linux-2.6.19.orig/include/linux/security.h
|
|
+++ linux-2.6.19/include/linux/security.h
|
|
@@ -1256,7 +1256,7 @@ struct security_operations {
|
|
size_t size, int flags);
|
|
int (*inode_getxattr) (struct vfsmount *mnt, struct dentry *dentry,
|
|
char *name);
|
|
- int (*inode_listxattr) (struct dentry *dentry);
|
|
+ int (*inode_listxattr) (struct vfsmount *mnt, struct dentry *dentry);
|
|
int (*inode_removexattr) (struct dentry *dentry, char *name);
|
|
const char *(*inode_xattr_getsuffix) (void);
|
|
int (*inode_getsecurity)(const struct inode *inode, const char *name, void *buffer, size_t size, int err);
|
|
@@ -1796,11 +1796,12 @@ static inline int security_inode_getxatt
|
|
return security_ops->inode_getxattr (mnt, dentry, name);
|
|
}
|
|
|
|
-static inline int security_inode_listxattr (struct dentry *dentry)
|
|
+static inline int security_inode_listxattr (struct vfsmount *mnt,
|
|
+ struct dentry *dentry)
|
|
{
|
|
if (unlikely (IS_PRIVATE (dentry->d_inode)))
|
|
return 0;
|
|
- return security_ops->inode_listxattr (dentry);
|
|
+ return security_ops->inode_listxattr (mnt, dentry);
|
|
}
|
|
|
|
static inline int security_inode_removexattr (struct dentry *dentry, char *name)
|
|
@@ -2497,7 +2498,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 vfsmount *mnt,
|
|
+ struct dentry *dentry)
|
|
{
|
|
return 0;
|
|
}
|
|
Index: linux-2.6.19/security/dummy.c
|
|
===================================================================
|
|
--- linux-2.6.19.orig/security/dummy.c
|
|
+++ linux-2.6.19/security/dummy.c
|
|
@@ -372,7 +372,7 @@ static int dummy_inode_getxattr (struct
|
|
return 0;
|
|
}
|
|
|
|
-static int dummy_inode_listxattr (struct dentry *dentry)
|
|
+static int dummy_inode_listxattr (struct vfsmount *mnt, struct dentry *dentry)
|
|
{
|
|
return 0;
|
|
}
|
|
Index: linux-2.6.19/security/selinux/hooks.c
|
|
===================================================================
|
|
--- linux-2.6.19.orig/security/selinux/hooks.c
|
|
+++ linux-2.6.19/security/selinux/hooks.c
|
|
@@ -2349,7 +2349,7 @@ static int selinux_inode_getxattr (struc
|
|
return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
|
|
}
|
|
|
|
-static int selinux_inode_listxattr (struct dentry *dentry)
|
|
+static int selinux_inode_listxattr (struct vfsmount *mnt, struct dentry *dentry)
|
|
{
|
|
return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
|
|
}
|