[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 7/9] block: Always abort reopen after prepare succeed
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 7/9] block: Always abort reopen after prepare succeeded |
Date: |
Mon, 19 Nov 2018 15:29:42 +0100 |
From: Max Reitz <address@hidden>
bdrv_reopen_multiple() does not invoke bdrv_reopen_abort() for the
element of the reopen queue for which bdrv_reopen_prepare() failed,
because it assumes that the prepare function will have rolled back all
changes already.
However, bdrv_reopen_prepare() does not do this in every case: It may
notice an error after BlockDriver.bdrv_reopen_prepare() succeeded, and
it will not invoke BlockDriver.bdrv_reopen_abort() then; and neither
will bdrv_reopen_multiple(), as explained above.
This is wrong because we must always call .bdrv_reopen_commit() or
.bdrv_reopen_abort() after .bdrv_reopen_prepare() has succeeded.
Otherwise, the block driver has no chance to undo what it has done in
its implementation of .bdrv_reopen_prepare().
To fix this, bdrv_reopen_prepare() has to call .bdrv_reopen_abort() if
it wants to return an error after .bdrv_reopen_prepare() has succeeded.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/block.c b/block.c
index fd67e14dfa..3feac08535 100644
--- a/block.c
+++ b/block.c
@@ -3201,6 +3201,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
BlockReopenQueue *queue,
QDict *orig_reopen_opts;
char *discard = NULL;
bool read_only;
+ bool drv_prepared = false;
assert(reopen_state != NULL);
assert(reopen_state->bs->drv != NULL);
@@ -3285,6 +3286,8 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
BlockReopenQueue *queue,
goto error;
}
+ drv_prepared = true;
+
/* Options that are not handled are only okay if they are unchanged
* compared to the old state. It is expected that some options are only
* used for the initial open, but not reopen (e.g. filename) */
@@ -3350,6 +3353,15 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
BlockReopenQueue *queue,
reopen_state->options = qobject_ref(orig_reopen_opts);
error:
+ if (ret < 0 && drv_prepared) {
+ /* drv->bdrv_reopen_prepare() has succeeded, so we need to
+ * call drv->bdrv_reopen_abort() before signaling an error
+ * (bdrv_reopen_multiple() will not call bdrv_reopen_abort()
+ * when the respective bdrv_reopen_prepare() has failed) */
+ if (drv->bdrv_reopen_abort) {
+ drv->bdrv_reopen_abort(reopen_state);
+ }
+ }
qemu_opts_del(opts);
qobject_unref(orig_reopen_opts);
g_free(discard);
--
2.19.1
- [Qemu-block] [PULL 0/9] Block layer patches, Kevin Wolf, 2018/11/19
- [Qemu-block] [PULL 1/9] nvme: fix oob access issue(CVE-2018-16847), Kevin Wolf, 2018/11/19
- [Qemu-block] [PULL 3/9] vvfat: Fix memory leak, Kevin Wolf, 2018/11/19
- [Qemu-block] [PULL 2/9] fdc: fix segfault in fdctrl_stop_transfer() when DMA is disabled, Kevin Wolf, 2018/11/19
- [Qemu-block] [PULL 7/9] block: Always abort reopen after prepare succeeded,
Kevin Wolf <=
- [Qemu-block] [PULL 4/9] qcow2: Document some maximum size constraints, Kevin Wolf, 2018/11/19
- [Qemu-block] [PULL 5/9] qcow2: Don't allow overflow during cluster allocation, Kevin Wolf, 2018/11/19
- [Qemu-block] [PULL 6/9] iotests: Add new test 220 for max compressed cluster offset, Kevin Wolf, 2018/11/19
- [Qemu-block] [PULL 8/9] file-posix: Fix shared locks on reopen commit, Kevin Wolf, 2018/11/19
- [Qemu-block] [PULL 9/9] iotests: Test file-posix locking and reopen, Kevin Wolf, 2018/11/19
- Re: [Qemu-block] [PULL 0/9] Block layer patches, Peter Maydell, 2018/11/19