Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new helpers: file_removexattr(), filename_removexattr()

Browse Source 
switch path_removexattrat() and fremovexattr(2) to those

Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2024-09-30 15:21:49 -04:00
parent 60ad149cf3
commit 22a4d1954c
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fs/xattr.c
View File

@ -957,23 +957,33 @@ removexattr(struct mnt_idmap *idmap, struct dentry *d, const char *name)
return vfs_removexattr(idmap, d, name); return vfs_removexattr(idmap, d, name);
} }
static int path_removexattr(const char __user *pathname, static int file_removexattr(struct file *f, struct xattr_name *kname)
const char __user *name, unsigned int lookup_flags) {
int error = mnt_want_write_file(f);
if (!error) {
audit_file(f);
error = removexattr(file_mnt_idmap(f),
f->f_path.dentry, kname->name);
mnt_drop_write_file(f);
}
return error;
}
/* unconditionally consumes filename */
static int filename_removexattr(int dfd, struct filename *filename,
unsigned int lookup_flags, struct xattr_name *kname)
{ {
struct path path; struct path path;
int error; int error;
struct xattr_name kname;
error = import_xattr_name(&kname, name);
if (error)
return error;
retry: retry:
error = user_path_at(AT_FDCWD, pathname, lookup_flags, &path); error = filename_lookup(dfd, filename, lookup_flags, &path, NULL);
if (error) if (error)
return error; goto out;
error = mnt_want_write(path.mnt); error = mnt_want_write(path.mnt);
if (!error) { if (!error) {
error = removexattr(mnt_idmap(path.mnt), path.dentry, kname.name); error = removexattr(mnt_idmap(path.mnt), path.dentry, kname->name);
mnt_drop_write(path.mnt); mnt_drop_write(path.mnt);
} }
path_put(&path); path_put(&path);
@ -981,9 +991,24 @@ static int path_removexattr(const char __user *pathname,
lookup_flags |= LOOKUP_REVAL; lookup_flags |= LOOKUP_REVAL;
goto retry; goto retry;
} }
out:
putname(filename);
return error; return error;
} }
static int path_removexattr(const char __user *pathname,
const char __user *name, unsigned int lookup_flags)
{
struct xattr_name kname;
int error;
error = import_xattr_name(&kname, name);
if (error)
return error;
return filename_removexattr(AT_FDCWD, getname(pathname), lookup_flags,
&kname);
}
SYSCALL_DEFINE2(removexattr, const char __user *, pathname, SYSCALL_DEFINE2(removexattr, const char __user *, pathname,
const char __user *, name) const char __user *, name)
{ {
@ -1004,19 +1029,11 @@ SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
if (fd_empty(f)) if (fd_empty(f))
return -EBADF; return -EBADF;
audit_file(fd_file(f));
error = import_xattr_name(&kname, name); error = import_xattr_name(&kname, name);
if (error) if (error)
return error; return error;
return file_removexattr(fd_file(f), &kname);
error = mnt_want_write_file(fd_file(f));
if (!error) {
error = removexattr(file_mnt_idmap(fd_file(f)),
fd_file(f)->f_path.dentry, kname.name);
mnt_drop_write_file(fd_file(f));
}
return error;
} }
int xattr_list_one(char **buffer, ssize_t *remaining_size, const char *name) int xattr_list_one(char **buffer, ssize_t *remaining_size, const char *name)