From: xiubli@redhat.com
To: josef@toxicpanda.com, axboe@kernel.dk, ming.lei@redhat.com
Cc: nbd@other.debian.org, linux-block@vger.kernel.org,
jdillama@redhat.com, mgolub@suse.de, Xiubo Li <xiubli@redhat.com>
Subject: [PATCH v2 2/2] nbd: add comments about double lock for config_lock confusion
Date: Mon, 2 Nov 2020 22:07:58 -0500 [thread overview]
Message-ID: <20201103030758.317781-3-xiubli@redhat.com> (raw)
In-Reply-To: <20201103030758.317781-1-xiubli@redhat.com>
From: Xiubo Li <xiubli@redhat.com>
When calling the ioctl(), fget() will be called on this fd, and
nbd_release() is only called when the fd's refcount drops to zero.
With this we can make sure that the nbd_release() won't be called
before the ioctl() finished.
So there won't have the double lock issue for the "config_lock",
which has already been held by nbd_ioctl().
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---
drivers/block/nbd.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 3bb8281bb753..48f36b003bf5 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1345,6 +1345,17 @@ static void nbd_clear_sock_ioctl(struct nbd_device *nbd,
sock_shutdown(nbd);
__invalidate_device(bdev, true);
nbd_bdev_reset(bdev);
+
+ /*
+ * When calling the ioctl(), fget() will be called on this
+ * fd, and nbd_release() is only called when the fd's refcount
+ * drops to zero. With this we can make sure that the
+ * nbd_release() won't be called before the ioctl() finished.
+ *
+ * So there won't have the double lock issue if it will
+ * call the nbd_config_put() here for the "config_lock", which
+ * has already been held by nbd_ioctl().
+ */
if (test_and_clear_bit(NBD_RT_HAS_CONFIG_REF,
&nbd->config->runtime_flags))
nbd_config_put(nbd);
--
2.18.4
prev parent reply other threads:[~2020-11-03 3:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 3:07 [PATCH v2 0/2] nbd: fix use-after-freed and double lock bugs xiubli
2020-11-03 3:07 ` [PATCH v2 1/2] nbd: fix use-after-freed crash for nbd->recv_workq xiubli
2020-11-03 4:12 ` Ming Lei
2020-11-03 6:40 ` Xiubo Li
2020-11-03 3:07 ` xiubli [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=20201103030758.317781-3-xiubli@redhat.com \
--to=xiubli@redhat.com \
--cc=axboe@kernel.dk \
--cc=jdillama@redhat.com \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=mgolub@suse.de \
--cc=ming.lei@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