block/monitor/block-hmp-cmds.c: Fix crash when execute hmp_commit
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
@@ -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
Am 24/04/2023 um 12:39 schrieb [email protected]:
Quoted 10 lines
From: Wang Liang <[email protected]>
hmp_commit()callsblk_is_available()from a non-coroutine context (and in the main loop).blk_is_available()is aco_wrapper_mixed_bdrv_rdlockfunction, and in the non-coroutine context it callsAIO_WAIT_WHILE(), which crashes if theaio_contextlock is not taken before.Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1615
Signed-off-by Wang Liang <[email protected]>
Thanks!
Kevin Wolf
AppliedAm 24.04.2023 um 12:39 hat [email protected] geschrieben:
Quoted 9 lines
From: Wang Liang <[email protected]>
hmp_commit()callsblk_is_available()from a non-coroutine context (and in the main loop).blk_is_available()is aco_wrapper_mixed_bdrv_rdlockfunction, and in the non-coroutine context it callsAIO_WAIT_WHILE(), which crashes if theaio_contextlock is not taken before.Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1615
Signed-off-by Wang Liang <[email protected]>
Thanks, applied to the block branch.
Kevin