From: Bill O'Donnell <bodonnel@redhat.com>
To: Ian Kent <raven@themaw.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Bill O'Donnell <billodo@redhat.com>,
Kernel Mailing List <linux-kernel@vger.kernel.org>,
autofs mailing list <autofs@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
syzbot+662f87a8ef490f45fa64@syzkaller.appspotmail.com
Subject: Re: [PATCH v2] autofs: add: new_inode check in autofs_fill_super()
Date: Sun, 19 Nov 2023 18:07:33 -0600 [thread overview]
Message-ID: <ZVqjRWcd4sBpooFW@redhat.com> (raw)
In-Reply-To: <20231119225319.331156-1-raven@themaw.net>
On Mon, Nov 20, 2023 at 06:53:19AM +0800, Ian Kent wrote:
> Add missing NULL check of root_inode in autofs_fill_super().
>
> While we are at it simplify the logic by taking advantage of the VFS
> cleanup procedures and get rid of the goto error handling, as suggested
> by Al Viro.
>
> Signed-off-by: Ian Kent <raven@themaw.net>
> Cc: Al Viro <viro@zeniv.linux.org.uk>
> Cc: Christian Brauner <brauner@kernel.org>
> Cc: Bill O'Donnell <billodo@redhat.com>
> Reported-by: syzbot+662f87a8ef490f45fa64@syzkaller.appspotmail.com
Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>
> ---
> fs/autofs/inode.c | 59 ++++++++++++++++++-----------------------------
> 1 file changed, 22 insertions(+), 37 deletions(-)
>
> diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
> index a5083d447a62..6ecf68536240 100644
> --- a/fs/autofs/inode.c
> +++ b/fs/autofs/inode.c
> @@ -311,7 +311,6 @@ static int autofs_fill_super(struct super_block *s, struct fs_context *fc)
> struct inode *root_inode;
> struct dentry *root;
> struct autofs_info *ino;
> - int ret = -ENOMEM;
>
> pr_debug("starting up, sbi = %p\n", sbi);
>
> @@ -328,56 +327,42 @@ static int autofs_fill_super(struct super_block *s, struct fs_context *fc)
> */
> ino = autofs_new_ino(sbi);
> if (!ino)
> - goto fail;
> + return -ENOMEM;
>
> root_inode = autofs_get_inode(s, S_IFDIR | 0755);
> - root_inode->i_uid = ctx->uid;
> - root_inode->i_gid = ctx->gid;
> -
> - root = d_make_root(root_inode);
> - if (!root)
> - goto fail_ino;
> -
> - root->d_fsdata = ino;
> + if (root_inode) {
> + root_inode->i_uid = ctx->uid;
> + root_inode->i_gid = ctx->gid;
> + root_inode->i_fop = &autofs_root_operations;
> + root_inode->i_op = &autofs_dir_inode_operations;
> + }
> + s->s_root = d_make_root(root_inode);
> + if (unlikely(!s->s_root)) {
> + autofs_free_ino(ino);
> + return -ENOMEM;
> + }
> + s->s_root->d_fsdata = ino;
>
> if (ctx->pgrp_set) {
> sbi->oz_pgrp = find_get_pid(ctx->pgrp);
> - if (!sbi->oz_pgrp) {
> - ret = invalf(fc, "Could not find process group %d",
> - ctx->pgrp);
> - goto fail_dput;
> - }
> - } else {
> + if (!sbi->oz_pgrp)
> + return invalf(fc, "Could not find process group %d",
> + ctx->pgrp);
> + } else
> sbi->oz_pgrp = get_task_pid(current, PIDTYPE_PGID);
> - }
>
> if (autofs_type_trigger(sbi->type))
> - __managed_dentry_set_managed(root);
> -
> - root_inode->i_fop = &autofs_root_operations;
> - root_inode->i_op = &autofs_dir_inode_operations;
> + /* s->s_root won't be contended so there's little to
> + * be gained by not taking the d_lock when setting
> + * d_flags, even when a lot mounts are being done.
> + */
> + managed_dentry_set_managed(s->s_root);
>
> pr_debug("pipe fd = %d, pgrp = %u\n",
> sbi->pipefd, pid_nr(sbi->oz_pgrp));
>
> sbi->flags &= ~AUTOFS_SBI_CATATONIC;
> -
> - /*
> - * Success! Install the root dentry now to indicate completion.
> - */
> - s->s_root = root;
> return 0;
> -
> - /*
> - * Failure ... clean up.
> - */
> -fail_dput:
> - dput(root);
> - goto fail;
> -fail_ino:
> - autofs_free_ino(ino);
> -fail:
> - return ret;
> }
>
> /*
> --
> 2.41.0
>
next prev parent reply other threads:[~2023-11-20 0:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-19 22:53 [PATCH v2] autofs: add: new_inode check in autofs_fill_super() Ian Kent
2023-11-20 0:07 ` Bill O'Donnell [this message]
2023-11-20 14:01 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZVqjRWcd4sBpooFW@redhat.com \
--to=bodonnel@redhat.com \
--cc=autofs@vger.kernel.org \
--cc=billodo@redhat.com \
--cc=brauner@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=raven@themaw.net \
--cc=syzbot+662f87a8ef490f45fa64@syzkaller.appspotmail.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).