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

coda: use param->file for FSCONFIG_SET_FD

Browse Source 
While the old code did support FSCONFIG_SET_FD, there's no need to
re-get the file the fs_context infrastructure already grabbed for us.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
Link: https://lore.kernel.org/r/20240731-fsconfig-fsparam_fd-fixes-v2-2-e7c472224417@cyphar.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Aleksa Sarai 2024-07-31 23:10:28 +10:00 committed by Christian Brauner
parent 6a64c5220c
commit 66e5cfee62
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
fs/coda/inode.c
View File

@ -119,31 +119,43 @@ static const struct fs_parameter_spec coda_param_specs[] = {
{} {}
}; };
static int coda_parse_fd(struct fs_context *fc, int fd) static int coda_set_idx(struct fs_context *fc, struct file *file)
{ {
struct coda_fs_context *ctx = fc->fs_private; struct coda_fs_context *ctx = fc->fs_private;
struct fd f;
struct inode *inode; struct inode *inode;
int idx; int idx;
f = fdget(fd); inode = file_inode(file);
if (!f.file)
return -EBADF;
inode = file_inode(f.file);
if (!S_ISCHR(inode->i_mode) || imajor(inode) != CODA_PSDEV_MAJOR) { if (!S_ISCHR(inode->i_mode) || imajor(inode) != CODA_PSDEV_MAJOR) {
fdput(f); return invalf(fc, "coda: Not coda psdev");
return invalf(fc, "code: Not coda psdev");
} }
idx = iminor(inode); idx = iminor(inode);
fdput(f);
if (idx < 0 || idx >= MAX_CODADEVS) if (idx < 0 || idx >= MAX_CODADEVS)
return invalf(fc, "coda: Bad minor number"); return invalf(fc, "coda: Bad minor number");
ctx->idx = idx; ctx->idx = idx;
return 0; return 0;
} }
static int coda_parse_fd(struct fs_context *fc, struct fs_parameter *param,
struct fs_parse_result *result)
{
struct file *file;
int err;
if (param->type == fs_value_is_file) {
file = param->file;
param->file = NULL;
} else {
file = fget(result->uint_32);
}
if (!file)
return -EBADF;
err = coda_set_idx(fc, file);
fput(file);
return err;
}
static int coda_parse_param(struct fs_context *fc, struct fs_parameter *param) static int coda_parse_param(struct fs_context *fc, struct fs_parameter *param)
{ {
struct fs_parse_result result; struct fs_parse_result result;
@ -155,7 +167,7 @@ static int coda_parse_param(struct fs_context *fc, struct fs_parameter *param)
switch (opt) { switch (opt) {
case Opt_fd: case Opt_fd:
return coda_parse_fd(fc, result.uint_32); return coda_parse_fd(fc, param, &result);
} }
return 0; return 0;
@ -167,6 +179,7 @@ static int coda_parse_param(struct fs_context *fc, struct fs_parameter *param)
*/ */
static int coda_parse_monolithic(struct fs_context *fc, void *_data) static int coda_parse_monolithic(struct fs_context *fc, void *_data)
{ {
struct file *file;
struct coda_mount_data *data = _data; struct coda_mount_data *data = _data;
if (!data) if (!data)
@ -175,7 +188,11 @@ static int coda_parse_monolithic(struct fs_context *fc, void *_data)
if (data->version != CODA_MOUNT_VERSION) if (data->version != CODA_MOUNT_VERSION)
return invalf(fc, "coda: Bad mount version"); return invalf(fc, "coda: Bad mount version");
coda_parse_fd(fc, data->fd); file = fget(data->fd);
if (file) {
coda_set_idx(fc, file);
fput(file);
}
return 0; return 0;
} }