mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
103 lines
3.2 KiB
Diff
103 lines
3.2 KiB
Diff
|
From: Tony Jones <tonyj@suse.de>
|
||
|
|
Subject: Add a struct vfsmount parameter to vfs_listxattr()
|
||
|
|
|
||
|
|
The vfsmount will be passed down to the LSM hook so that LSMs can compute
|
||
|
|
pathnames.
|
||
|
|
|
||
|
|
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 | 25 ++++++++++++++-----------
|
||
|
|
include/linux/xattr.h | 3 ++-
|
||
|
|
2 files changed, 16 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
--- a/fs/xattr.c
|
||
|
|
+++ b/fs/xattr.c
|
||
|
|
@@ -142,18 +142,20 @@ vfs_getxattr(struct dentry *dentry, stru
|
||
|
|
EXPORT_SYMBOL_GPL(vfs_getxattr);
|
||
|
|
|
||
|
|
ssize_t
|
||
|
|
-vfs_listxattr(struct dentry *d, char *list, size_t size)
|
||
|
|
+vfs_listxattr(struct dentry *dentry, struct vfsmount *mnt, char *list,
|
||
|
|
+ size_t size)
|
||
|
|
{
|
||
|
|
+ struct inode *inode = dentry->d_inode;
|
||
|
|
ssize_t error;
|
||
|
|
|
||
|
|
- error = security_inode_listxattr(d);
|
||
|
|
+ error = security_inode_listxattr(dentry);
|
||
|
|
if (error)
|
||
|
|
return error;
|
||
|
|
error = -EOPNOTSUPP;
|
||
|
|
- if (d->d_inode->i_op && d->d_inode->i_op->listxattr) {
|
||
|
|
- error = d->d_inode->i_op->listxattr(d, list, size);
|
||
|
|
- } else {
|
||
|
|
- error = security_inode_listsecurity(d->d_inode, list, size);
|
||
|
|
+ if (inode->i_op && inode->i_op->listxattr)
|
||
|
|
+ error = inode->i_op->listxattr(dentry, list, size);
|
||
|
|
+ else {
|
||
|
|
+ error = security_inode_listsecurity(inode, list, size);
|
||
|
|
if (size && error > size)
|
||
|
|
error = -ERANGE;
|
||
|
|
}
|
||
|
|
@@ -361,7 +363,8 @@ sys_fgetxattr(int fd, char __user *name,
|
||
|
|
* Extended attribute LIST operations
|
||
|
|
*/
|
||
|
|
static ssize_t
|
||
|
|
-listxattr(struct dentry *d, char __user *list, size_t size)
|
||
|
|
+listxattr(struct dentry *dentry, struct vfsmount *mnt, char __user *list,
|
||
|
|
+ size_t size)
|
||
|
|
{
|
||
|
|
ssize_t error;
|
||
|
|
char *klist = NULL;
|
||
|
|
@@ -374,7 +377,7 @@ listxattr(struct dentry *d, char __user
|
||
|
|
return -ENOMEM;
|
||
|
|
}
|
||
|
|
|
||
|
|
- error = vfs_listxattr(d, klist, size);
|
||
|
|
+ error = vfs_listxattr(dentry, mnt, klist, size);
|
||
|
|
if (error > 0) {
|
||
|
|
if (size && copy_to_user(list, klist, error))
|
||
|
|
error = -EFAULT;
|
||
|
|
@@ -396,7 +399,7 @@ sys_listxattr(char __user *path, char __
|
||
|
|
error = user_path_walk(path, &nd);
|
||
|
|
if (error)
|
||
|
|
return error;
|
||
|
|
- error = listxattr(nd.dentry, list, size);
|
||
|
|
+ error = listxattr(nd.dentry, nd.mnt, list, size);
|
||
|
|
path_release(&nd);
|
||
|
|
return error;
|
||
|
|
}
|
||
|
|
@@ -410,7 +413,7 @@ sys_llistxattr(char __user *path, char _
|
||
|
|
error = user_path_walk_link(path, &nd);
|
||
|
|
if (error)
|
||
|
|
return error;
|
||
|
|
- error = listxattr(nd.dentry, list, size);
|
||
|
|
+ error = listxattr(nd.dentry, nd.mnt, list, size);
|
||
|
|
path_release(&nd);
|
||
|
|
return error;
|
||
|
|
}
|
||
|
|
@@ -425,7 +428,7 @@ sys_flistxattr(int fd, char __user *list
|
||
|
|
if (!f)
|
||
|
|
return error;
|
||
|
|
audit_inode(NULL, f->f_path.dentry);
|
||
|
|
- error = listxattr(f->f_path.dentry, list, size);
|
||
|
|
+ error = listxattr(f->f_path.dentry, f->f_path.mnt, list, size);
|
||
|
|
fput(f);
|
||
|
|
return error;
|
||
|
|
}
|
||
|
|
--- a/include/linux/xattr.h
|
||
|
|
+++ b/include/linux/xattr.h
|
||
|
|
@@ -48,7 +48,8 @@ struct xattr_handler {
|
||
|
|
|
||
|
|
ssize_t vfs_getxattr(struct dentry *, struct vfsmount *, char *, void *,
|
||
|
|
size_t);
|
||
|
|
-ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
|
||
|
|
+ssize_t vfs_listxattr(struct dentry *d, struct vfsmount *, char *list,
|
||
|
|
+ size_t size);
|
||
|
|
int vfs_setxattr(struct dentry *, struct vfsmount *, char *, void *, size_t,
|
||
|
|
int);
|
||
|
|
int vfs_removexattr(struct dentry *, char *);
|