From: "sunke (E)" <sunke32@huawei.com>
To: Mike Christie <mchristi@redhat.com>, <josef@toxicpanda.com>,
<axboe@kernel.dk>
Cc: <linux-block@vger.kernel.org>, <nbd@other.debian.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [v3] nbd: fix potential NULL pointer fault in nbd_genl_disconnect
Date: Tue, 11 Feb 2020 12:12:48 +0800 [thread overview]
Message-ID: <c3531fc5-73b3-6ef4-816e-97f491f45c18@huawei.com> (raw)
In-Reply-To: <5E418D62.8090102@redhat.com>
在 2020/2/11 1:05, Mike Christie 写道:
> On 02/10/2020 01:32 AM, Sun Ke wrote:
>> Open /dev/nbdX first, the config_refs will be 1 and
>> the pointers in nbd_device are still null. Disconnect
>> /dev/nbdX, then reference a null recv_workq. The
>> protection by config_refs in nbd_genl_disconnect is useless.
>>
>> To fix it, just add a check for a non null task_recv in
>> nbd_genl_disconnect.
>>
>> Signed-off-by: Sun Ke <sunke32@huawei.com>
>> ---
>> v1 -> v2:
>> Add an omitted mutex_unlock.
>>
>> v2 -> v3:
>> Add nbd->config_lock, suggested by Josef.
>> ---
>> drivers/block/nbd.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
>> index b4607dd96185..870b3fd0c101 100644
>> --- a/drivers/block/nbd.c
>> +++ b/drivers/block/nbd.c
>> @@ -2008,12 +2008,20 @@ static int nbd_genl_disconnect(struct sk_buff *skb, struct genl_info *info)
>> index);
>> return -EINVAL;
>> }
>> + mutex_lock(&nbd->config_lock);
>> if (!refcount_inc_not_zero(&nbd->refs)) {
>> + mutex_unlock(&nbd->config_lock);
>> mutex_unlock(&nbd_index_mutex);
>> printk(KERN_ERR "nbd: device at index %d is going down\n",
>> index);
>> return -EINVAL;
>> }
>> + if (!nbd->recv_workq) {
>> + mutex_unlock(&nbd->config_lock);
>> + mutex_unlock(&nbd_index_mutex);
>> + return -EINVAL;
>> + }
>> + mutex_unlock(&nbd->config_lock);
>> mutex_unlock(&nbd_index_mutex);
>> if (!refcount_inc_not_zero(&nbd->config_refs)) {
>> nbd_put(nbd);
>>
>
> With my other patch then we will not need this right? It handles your
> case by just being integrated with the existing checks in:
>
> nbd_disconnect_and_put->nbd_clear_sock->sock_shutdown
>
> ...
>
> static void sock_shutdown(struct nbd_device *nbd)
> {
>
> ....
>
> if (config->num_connections == 0)
> return;
>
>
> num_connections is zero for your case since we never did a
> nbd_genl_disconnect so we would return here.
>
>
> .
>
Hi Mike
Your point is not right totally.
Yes, config->num_connections is 0 and will return in sock_shutdown. Then
it will back to nbd_disconnect_and_put and do flush_workqueue
(nbd->recv_workq).
nbd_disconnect_and_put
->nbd_clear_sock
->sock_shutdown
->flush_workqueue
Thanks,
Sun Ke
next prev parent reply other threads:[~2020-02-11 4:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-10 7:32 Sun Ke
2020-02-10 17:05 ` Mike Christie
2020-02-11 4:12 ` sunke (E) [this message]
2020-02-11 16:39 ` Mike Christie
2020-02-12 2:00 ` sunke (E)
2020-06-01 11:41 ` Sun Ke
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=c3531fc5-73b3-6ef4-816e-97f491f45c18@huawei.com \
--to=sunke32@huawei.com \
--cc=axboe@kernel.dk \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchristi@redhat.com \
--cc=nbd@other.debian.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
all inboxes | Powered by JetHome®