[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/7] block/nbd: Assert there are no timers when closed
From: |
Hanna Reitz |
Subject: |
[PATCH 3/7] block/nbd: Assert there are no timers when closed |
Date: |
Thu, 3 Feb 2022 17:30:20 +0100 |
Our two timers must not remain armed beyond nbd_clear_bdrvstate(), or
they will access freed data when they fire.
This patch is separate from the patches that actually fix the issue
(HEAD^^ and HEAD^) so that you can run the associated regression iotest
(281) on a configuration that reproducibly exposes the bug.
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
block/nbd.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/block/nbd.c b/block/nbd.c
index 5ff8a57314..dc6c3f3bbc 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -110,6 +110,10 @@ static void nbd_clear_bdrvstate(BlockDriverState *bs)
yank_unregister_instance(BLOCKDEV_YANK_INSTANCE(bs->node_name));
+ /* Must not leave timers behind that would access freed data */
+ assert(!s->reconnect_delay_timer);
+ assert(!s->open_timer);
+
object_unref(OBJECT(s->tlscreds));
qapi_free_SocketAddress(s->saddr);
s->saddr = NULL;
--
2.34.1
- [PATCH 0/7] block/nbd: Move s->ioc on AioContext change, Hanna Reitz, 2022/02/03
- [PATCH 1/7] block/nbd: Delete reconnect delay timer when done, Hanna Reitz, 2022/02/03
- [PATCH 2/7] block/nbd: Delete open timer when done, Hanna Reitz, 2022/02/03
- [PATCH 4/7] iotests.py: Add QemuStorageDaemon class, Hanna Reitz, 2022/02/03
- [PATCH 3/7] block/nbd: Assert there are no timers when closed,
Hanna Reitz <=
- [PATCH 6/7] block/nbd: Move s->ioc on AioContext change, Hanna Reitz, 2022/02/03
- [PATCH 7/7] iotests/281: Let NBD connection yield in iothread, Hanna Reitz, 2022/02/03
- [PATCH 5/7] iotests/281: Test lingering timers, Hanna Reitz, 2022/02/03