mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-26 03:42:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fuse: support FSCONFIG_SET_FD for "fd" option

Browse Source 
This is not only cleaner to use in userspace (no need to sprintf the fd to
a string) but also allows userspace to detect that the devfd can be closed
after the fsconfig call.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
This commit is contained in:
Miklos Szeredi
2026-03-12 20:30:08 +01:00
parent 4ae404afd9
commit 2339f9cc9f
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fs/fuse/inode.c
View File

@@ -791,7 +791,7 @@ enum {
static const struct fs_parameter_spec fuse_fs_parameters[] = {
fsparam_string ("source", OPT_SOURCE),
fsparam_u32 ("fd", OPT_FD),
fsparam_fd ("fd", OPT_FD),
fsparam_u32oct ("rootmode", OPT_ROOTMODE),
fsparam_uid ("user_id", OPT_USER_ID),
fsparam_gid ("group_id", OPT_GROUP_ID),
@@ -803,13 +803,9 @@ static const struct fs_parameter_spec fuse_fs_parameters[] = {
{}
};
static int fuse_opt_fd(struct fs_context *fsc, int fd)
static int fuse_opt_fd(struct fs_context *fsc, struct file *file)
{
struct fuse_fs_context *ctx = fsc->fs_private;
struct file *file __free(fput) = fget(fd);
if (!file)
return -EBADF;
if (file->f_op != &fuse_dev_operations)
return invalfc(fsc, "fd is not a fuse device");
@@ -865,7 +861,15 @@ static int fuse_parse_param(struct fs_context *fsc, struct fs_parameter *param)
return 0;
case OPT_FD:
return fuse_opt_fd(fsc, result.uint_32);
if (param->type == fs_value_is_file) {
return fuse_opt_fd(fsc, param->file);
} else {
struct file *file __free(fput) = fget(result.uint_32);
if (!file)
return -EBADF;
return fuse_opt_fd(fsc, file);
}
case OPT_ROOTMODE:
if (!fuse_valid_type(result.uint_32))