From: Marc-André Lureau <[email protected]>
gpa2hva() returns a referenced MemoryRegion via its p_mr out-parameter
(inherited from memory_region_find()), but both SEV callers were failing
to release it.
Fixes: c7f7e6970d3b ("sev: add sev-inject-launch-secret")
Reviewed-by: Peter Xu <[email protected]>
Reviewed-by: Zhao Liu <[email protected]>
Signed-off-by: Marc-André Lureau <[email protected]>
Message-ID: <[email protected]>
(cherry picked from commit 415f2759d7b3294e15c783849a08deb26885cabc)
Signed-off-by: Michael Tokarev <[email protected]>
diff --git a/include/exec/memory.h b/include/exec/memory.h
index ef6af5caee2..e47f6c4639a 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1257,6 +1257,8 @@ void memory_region_ref(MemoryRegion *mr);
*/
void memory_region_unref(MemoryRegion *mr);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(MemoryRegion, memory_region_unref)
+
/**
* memory_region_init_io: Initialize an I/O memory region.
*
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 0e1dbb6959e..d070014217e 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -1269,7 +1269,7 @@ snp_populate_metadata_pages(SevSnpGuestState *sev_snp,
OvmfSevMetadataDesc *desc;
int type, ret, i;
void *hva;
- MemoryRegion *mr = NULL;
+ g_autoptr(MemoryRegion) mr = NULL;
for (i = 0; i < metadata->num_desc; i++) {
desc = &metadata->descs[i];
@@ -1641,7 +1641,7 @@ int sev_inject_launch_secret(const char *packet_hdr,
const char *secret,
int error, ret = 1;
void *hva;
gsize hdr_sz = 0, data_sz = 0;
- MemoryRegion *mr = NULL;
+ g_autoptr(MemoryRegion) mr = NULL;
SevCommonState *sev_common = SEV_COMMON(MACHINE(qdev_get_machine())->cgs);
if (!sev_common) {
--
2.47.3
