From: Greg Kurz <groug@kaod.org>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: virtualization@lists.linux-foundation.org,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
virtio-fs@redhat.com, Stefan Hajnoczi <stefanha@redhat.com>,
Max Reitz <mreitz@redhat.com>, Vivek Goyal <vgoyal@redhat.com>,
Greg Kurz <groug@kaod.org>
Subject: [PATCH v4 1/5] fuse: Fix leak in fuse_dentry_automount() error path
Date: Thu, 20 May 2021 17:46:50 +0200 [thread overview]
Message-ID: <20210520154654.1791183-2-groug@kaod.org> (raw)
In-Reply-To: <20210520154654.1791183-1-groug@kaod.org>
Some rollback was forgotten during the addition of crossmounts.
Fixes: bf109c64040f ("fuse: implement crossmounts")
Cc: mreitz@redhat.com
Signed-off-by: Greg Kurz <groug@kaod.org>
---
fs/fuse/dir.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 1b6c001a7dd1..fb2af70596c3 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -339,8 +339,11 @@ static struct vfsmount *fuse_dentry_automount(struct path *path)
/* Initialize superblock, making @mp_fi its root */
err = fuse_fill_super_submount(sb, mp_fi);
- if (err)
+ if (err) {
+ fuse_conn_put(fc);
+ kfree(fm);
goto out_put_sb;
+ }
sb->s_flags |= SB_ACTIVE;
fsc->root = dget(sb->s_root);
--
2.26.3
next prev parent reply other threads:[~2021-05-20 15:47 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 15:46 [PATCH v4 0/5] virtiofs: propagate sync() to file server Greg Kurz
2021-05-20 15:46 ` Greg Kurz [this message]
2021-05-20 19:45 ` [PATCH v4 1/5] fuse: Fix leak in fuse_dentry_automount() error path Al Viro
2021-05-21 7:54 ` Miklos Szeredi
2021-05-21 8:15 ` Greg Kurz
2021-05-21 8:23 ` Miklos Szeredi
2021-05-21 8:08 ` Greg Kurz
2021-05-20 15:46 ` [PATCH v4 2/5] fuse: Call vfs_get_tree() for submounts Greg Kurz
2021-05-21 8:19 ` Miklos Szeredi
2021-05-21 8:28 ` Greg Kurz
2021-05-22 17:50 ` kernel test robot
2021-05-22 20:12 ` kernel test robot
2021-05-20 15:46 ` [PATCH v4 3/5] fuse: Make fuse_fill_super_submount() static Greg Kurz
2021-05-20 15:46 ` [PATCH v4 4/5] virtiofs: Skip submounts in sget_fc() Greg Kurz
2021-05-21 8:26 ` Miklos Szeredi
2021-05-21 8:39 ` Greg Kurz
2021-05-21 8:50 ` Miklos Szeredi
2021-05-21 10:06 ` Greg Kurz
2021-05-21 12:37 ` Miklos Szeredi
2021-05-21 13:36 ` Greg Kurz
2021-05-20 15:46 ` [PATCH v4 5/5] virtiofs: propagate sync() to file server Greg Kurz
2021-05-21 10:08 ` Greg Kurz
2021-05-21 12:51 ` Miklos Szeredi
2021-08-15 14:14 ` Amir Goldstein
2021-08-16 15:29 ` Vivek Goyal
2021-08-16 18:57 ` Amir Goldstein
2021-08-16 19:11 ` Vivek Goyal
2021-08-16 19:46 ` Amir Goldstein
2021-08-28 15:21 ` Miklos Szeredi
2021-08-30 17:01 ` Vivek Goyal
2021-08-30 17:36 ` Miklos Szeredi
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=20210520154654.1791183-2-groug@kaod.org \
--to=groug@kaod.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=mreitz@redhat.com \
--cc=stefanha@redhat.com \
--cc=vgoyal@redhat.com \
--cc=virtio-fs@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/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).