diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2018-11-09 15:52:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-21 09:27:44 +0100 |
| commit | 6023d16fdb84e849d4aa60c2bc1ea294a217d6cb (patch) | |
| tree | 35df80f7d2884f2b92ad9d449da6424d8f3e3620 | |
| parent | 453e01cc6d80b189b8dae4564dc8680093bbb2ec (diff) | |
| download | linux-stable-6023d16fdb84e849d4aa60c2bc1ea294a217d6cb.tar.gz linux-stable-6023d16fdb84e849d4aa60c2bc1ea294a217d6cb.tar.bz2 linux-stable-6023d16fdb84e849d4aa60c2bc1ea294a217d6cb.zip | |
fuse: fix leaked notify reply
commit 7fabaf303458fcabb694999d6fa772cc13d4e217 upstream.
fuse_request_send_notify_reply() may fail if the connection was reset for
some reason (e.g. fs was unmounted). Don't leak request reference in this
case. Besides leaking memory, this resulted in fc->num_waiting not being
decremented and hence fuse_wait_aborted() left in a hanging and unkillable
state.
Fixes: 2d45ba381a74 ("fuse: add retrieve request")
Fixes: b8f95e5d13f5 ("fuse: umount should wait for all requests")
Reported-and-tested-by: syzbot+6339eda9cb4ebbc4c37b@syzkaller.appspotmail.com
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Cc: <stable@vger.kernel.org> #v2.6.36
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/fuse/dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 18e2f54737d1..e566652ac922 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1771,8 +1771,10 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, req->in.args[1].size = total_len; err = fuse_request_send_notify_reply(fc, req, outarg->notify_unique); - if (err) + if (err) { fuse_retrieve_end(fc, req); + fuse_put_request(fc, req); + } return err; } |