Skip to contentSkip to conversation

block/monitor/block-hmp-cmds.c: Fix crash when execute hmp_commit

PATCH Applied [email protected] 3 participants 3 messages Apr 24, 2023 – Apr 25, 2023 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 block/monitor/block-hmp-cmds.c: Fix crash when execute hmp_commit

From: Wang Liang <[email protected]>

hmp_commit() calls blk_is_available() from a non-coroutine context (and in the main loop). blk_is_available() is a co_wrapper_mixed_bdrv_rdlock function, and in the non-coroutine context it calls AIO_WAIT_WHILE(), which crashes if the aio_context lock is not taken before.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1615

---
 block/monitor/block-hmp-cmds.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
block/monitor/block-hmp-cmds.c +6 -4
index 2846083546..ca2599de44 100644
@@ -214,15 +214,17 @@ void hmp_commit(Monitor *mon, const QDict *qdict)
             error_report("Device '%s' not found", device);
             return;
         }
-        if (!blk_is_available(blk)) {
-            error_report("Device '%s' has no medium", device);
-            return;
-        }
 
         bs = bdrv_skip_implicit_filters(blk_bs(blk));
         aio_context = bdrv_get_aio_context(bs);
         aio_context_acquire(aio_context);
 
+        if (!blk_is_available(blk)) {
+            error_report("Device '%s' has no medium", device);
+            aio_context_release(aio_context);
+            return;
+        }
+
         ret = bdrv_commit(bs);
 
         aio_context_release(aio_context);
Signature · 1 line
2.27.0
Reviewed-by on v2 1/1
#1 lore raw

Am 24/04/2023 um 12:39 schrieb [email protected]:

Quoted 10 lines

From: Wang Liang <[email protected]>

hmp_commit() calls blk_is_available() from a non-coroutine context (and in the main loop). blk_is_available() is a co_wrapper_mixed_bdrv_rdlock function, and in the non-coroutine context it calls AIO_WAIT_WHILE(), which crashes if the aio_context lock is not taken before.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1615

Thanks!

Applied
#2 lore raw
In reply to [email protected]

Am 24.04.2023 um 12:39 hat [email protected] geschrieben:

Quoted 9 lines

From: Wang Liang <[email protected]>

hmp_commit() calls blk_is_available() from a non-coroutine context (and in the main loop). blk_is_available() is a co_wrapper_mixed_bdrv_rdlock function, and in the non-coroutine context it calls AIO_WAIT_WHILE(), which crashes if the aio_context lock is not taken before.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1615

Thanks, applied to the block branch.

Kevin