From: Steve French <smfrench@gmail.com>
To: Ronnie Sahlberg <lsahlber@redhat.com>,
Dan Carpenter <dan.carpenter@oracle.com>
Cc: linux-cifs <linux-cifs@vger.kernel.org>
Subject: Re: [PATCH] cifs: fix use after free in cifs_smb3_do_mount()
Date: Tue, 15 Dec 2020 16:57:02 -0600 [thread overview]
Message-ID: <CAH2r5mtq1p99QDmTRcfK8D6sfWB5jb2nObANTwrkegFepinEhw@mail.gmail.com> (raw)
In-Reply-To: <20201215225133.20378-1-lsahlber@redhat.com>
merged into cifs-2.6.git for-next to address the issue Dan pointed out.
On Tue, Dec 15, 2020 at 4:51 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote:
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> ---
> fs/cifs/cifsfs.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index 4c385eeecc05..2c6e54fa6429 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -836,12 +836,14 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
> if (IS_ERR(sb)) {
> root = ERR_CAST(sb);
> cifs_umount(cifs_sb);
> + cifs_sb = NULL;
> goto out;
> }
>
> if (sb->s_root) {
> cifs_dbg(FYI, "Use existing superblock\n");
> cifs_umount(cifs_sb);
> + cifs_sb = NULL;
> } else {
> rc = cifs_read_super(sb);
> if (rc) {
> @@ -852,7 +854,7 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,
> sb->s_flags |= SB_ACTIVE;
> }
>
> - root = cifs_get_root(cifs_sb->ctx, sb);
> + root = cifs_get_root(cifs_sb ? cifs_sb->ctx : old_ctx, sb);
> if (IS_ERR(root))
> goto out_super;
>
> --
> 2.13.6
>
--
Thanks,
Steve
prev parent reply other threads:[~2020-12-15 22:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 22:51 [PATCH] cifs: fix use after free in cifs_smb3_do_mount() Ronnie Sahlberg
2020-12-15 22:57 ` Steve French [this message]
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=CAH2r5mtq1p99QDmTRcfK8D6sfWB5jb2nObANTwrkegFepinEhw@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=linux-cifs@vger.kernel.org \
--cc=lsahlber@redhat.com \
/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 NNTP newsgroup(s).