From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 1/7] fuse: Check for fc->connected in fuse_dev_alloc()
Date: Fri, 18 Jan 2019 15:28:42 +0300 [thread overview]
Message-ID: <98ae21a4-fb96-c06e-e442-5929d36f2bf3@virtuozzo.com> (raw)
In-Reply-To: <CAJfpegv0bQPN5ZJPVmAW=F8gTq-e=Jswc6V0U3Nvit_nULGk4g@mail.gmail.com>
On 18.01.2019 15:07, Miklos Szeredi wrote:
> On Tue, Jan 15, 2019 at 11:19 AM Kirill Tkhai <ktkhai@virtuozzo.com> wrote:
>>
>> fuse_dev_alloc() may be called after fc->connected
>> is dropped (from ioctl), so here we add sanity check
>> for that case.
>
> AFAICS this is not fixing a bug; i.e. even if the fuse_dev is added to
> the fuse_conn's list after disconnection there would be no leak.
>
> In other words, it's irrelevant whether the connection reset comes
> just before the ioctl completes or just after. Or am I missing
> something?
Yeah, there won't be a leak. The only problem I see, userspace daemon
may become waiting in fuse_dev_do_read() after abort is finished.
This means fc->count won't be put, and manual killing signal will be
needed.
I.e., umount -f will wait till the daemon is killed manually.
Not so big a problem, but not very pleasant...
Kirill
>>
>> Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
>> ---
>> fs/fuse/inode.c | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
>> index 336844d0eb3a..0361a3d62356 100644
>> --- a/fs/fuse/inode.c
>> +++ b/fs/fuse/inode.c
>> @@ -1054,10 +1054,19 @@ struct fuse_dev *fuse_dev_alloc(struct fuse_conn *fc)
>> fuse_pqueue_init(&fud->pq);
>>
>> spin_lock(&fc->lock);
>> + if (!fc->connected) {
>> + spin_unlock(&fc->lock);
>> + goto out_put;
>> + }
>> list_add_tail(&fud->entry, &fc->devices);
>> spin_unlock(&fc->lock);
>>
>> return fud;
>> +out_put:
>> + fuse_conn_put(fc);
>> + kfree(pq);
>> + kfree(fud);
>> + return NULL;
>> }
>> EXPORT_SYMBOL_GPL(fuse_dev_alloc);
>>
>>
next prev parent reply other threads:[~2019-01-18 12:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-15 10:19 [PATCH 0/7] fuse: Improve disconnect scheme and avoid taking fpq->lock on hot paths Kirill Tkhai
2019-01-15 10:19 ` [PATCH 1/7] fuse: Check for fc->connected in fuse_dev_alloc() Kirill Tkhai
2019-01-18 12:07 ` Miklos Szeredi
2019-01-18 12:28 ` Kirill Tkhai [this message]
2019-01-23 9:45 ` Miklos Szeredi
2019-01-23 9:55 ` Kirill Tkhai
2019-01-23 10:24 ` Miklos Szeredi
2019-01-15 10:19 ` [PATCH 2/7] fuse: Move flush_bg_queue() up in fuse_abort_conn() Kirill Tkhai
2019-01-15 10:19 ` [PATCH 3/7] fuse: Drop and reacquire fc->lock in middle of fuse_abort_conn() Kirill Tkhai
2019-01-15 10:19 ` [PATCH 4/7] fuse: Add fud pointer to struct fuse_copy_state Kirill Tkhai
2019-01-15 10:19 ` [PATCH 5/7] fuse: Introduce generic fuse_copy_aborted() Kirill Tkhai
2019-01-17 9:48 ` Miklos Szeredi
2019-01-15 10:19 ` [PATCH 6/7] fuse: Kill unused FR_ABORTED, FR_LOCKED and FR_PRIVATE flags Kirill Tkhai
2019-01-15 10:19 ` [PATCH 7/7] fuse: Kill fuse_pqueue::io list and avoid taking fpq->lock on hot paths Kirill Tkhai
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=98ae21a4-fb96-c06e-e442-5929d36f2bf3@virtuozzo.com \
--to=ktkhai@virtuozzo.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=miklos@szeredi.hu \
/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).