iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autofs: add autofs_parse_fd()

Browse Source 
Factor out the fd mount option handling.

Signed-off-by: Ian Kent <raven@themaw.net>
Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>
Message-Id: <20230922041215.13675-3-raven@themaw.net>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Ian Kent 2023-09-22 12:12:09 +08:00 committed by Christian Brauner
parent bc69fdde0a
commit 546694b8f6
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
fs/autofs/inode.c
View File

@ -129,6 +129,33 @@ static const match_table_t tokens = {
{Opt_err, NULL} {Opt_err, NULL}
}; };
static int autofs_parse_fd(struct autofs_sb_info *sbi, int fd)
{
struct file *pipe;
int ret;
pipe = fget(fd);
if (!pipe) {
pr_err("could not open pipe file descriptor\n");
return -EBADF;
}
ret = autofs_check_pipe(pipe);
if (ret < 0) {
pr_err("Invalid/unusable pipe\n");
fput(pipe);
return -EBADF;
}
if (sbi->pipe)
fput(sbi->pipe);
sbi->pipefd = fd;
sbi->pipe = pipe;
return 0;
}
static int parse_options(char *options, static int parse_options(char *options,
struct inode *root, int *pgrp, bool *pgrp_set, struct inode *root, int *pgrp, bool *pgrp_set,
struct autofs_sb_info *sbi) struct autofs_sb_info *sbi)
@ -139,6 +166,7 @@ static int parse_options(char *options,
int pipefd = -1; int pipefd = -1;
kuid_t uid; kuid_t uid;
kgid_t gid; kgid_t gid;
int ret;
root->i_uid = current_uid(); root->i_uid = current_uid();
root->i_gid = current_gid(); root->i_gid = current_gid();
@ -162,7 +190,9 @@ static int parse_options(char *options,
case Opt_fd: case Opt_fd:
if (match_int(args, &pipefd)) if (match_int(args, &pipefd))
return 1; return 1;
sbi->pipefd = pipefd; ret = autofs_parse_fd(sbi, pipefd);
if (ret)
return 1;
break; break;
case Opt_uid: case Opt_uid:
if (match_int(args, &option)) if (match_int(args, &option))
@ -222,7 +252,6 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
{ {
struct inode *root_inode; struct inode *root_inode;
struct dentry *root; struct dentry *root;
struct file *pipe;
struct autofs_sb_info *sbi; struct autofs_sb_info *sbi;
struct autofs_info *ino; struct autofs_info *ino;
int pgrp = 0; int pgrp = 0;
@ -275,7 +304,6 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
ret = -ENOMEM; ret = -ENOMEM;
goto fail_ino; goto fail_ino;
} }
pipe = NULL;
root->d_fsdata = ino; root->d_fsdata = ino;
@ -321,16 +349,7 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
pr_debug("pipe fd = %d, pgrp = %u\n", pr_debug("pipe fd = %d, pgrp = %u\n",
sbi->pipefd, pid_nr(sbi->oz_pgrp)); sbi->pipefd, pid_nr(sbi->oz_pgrp));
pipe = fget(sbi->pipefd);
if (!pipe) {
pr_err("could not open pipe file descriptor\n");
goto fail_put_pid;
}
ret = autofs_prepare_pipe(pipe);
if (ret < 0)
goto fail_fput;
sbi->pipe = pipe;
sbi->flags &= ~AUTOFS_SBI_CATATONIC; sbi->flags &= ~AUTOFS_SBI_CATATONIC;
/* /*
@ -342,11 +361,6 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
/* /*
* Failure ... clean up. * Failure ... clean up.
*/ */
fail_fput:
pr_err("pipe file descriptor does not contain proper ops\n");
fput(pipe);
fail_put_pid:
put_pid(sbi->oz_pgrp);
fail_dput: fail_dput:
dput(root); dput(root);
goto fail_free; goto fail_free;