37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
|
From 9c5278b1cb8c4f524f519e4f54332c5333a8e4a2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 5 Sep 2024 04:13:36 -0700
|
||
|
|
Subject: [PATCH] savevm: Fix load_snapshot error path crash
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
An error path missed setting *errp, which can cause a NULL deref.
|
||
|
|
|
||
|
|
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
|
||
|
|
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
|
||
|
|
Message-Id: <20240813050638.446172-11-npiggin@gmail.com>
|
||
|
|
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
|
||
|
|
Message-Id: <20240813202329.1237572-19-alex.bennee@linaro.org>
|
||
|
|
(cherry picked from commit 97d2b66dcd8c771065807b4acfd0002dac4385be)
|
||
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
migration/savevm.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/migration/savevm.c b/migration/savevm.c
|
||
|
|
index d59e976d50..b501504bd5 100644
|
||
|
|
--- a/migration/savevm.c
|
||
|
|
+++ b/migration/savevm.c
|
||
|
|
@@ -3022,6 +3022,7 @@ bool load_snapshot(const char *name, const char *vmstate,
|
||
|
|
ret = bdrv_snapshot_find(bs_vm_state, &sn, name);
|
||
|
|
aio_context_release(aio_context);
|
||
|
|
if (ret < 0) {
|
||
|
|
+ error_setg(errp, "Snapshot can not be found");
|
||
|
|
return false;
|
||
|
|
} else if (sn.vm_state_size == 0) {
|
||
|
|
error_setg(errp, "This is a disk-only snapshot. Revert to it "
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|