mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-03 19:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging

Browse Source 
Fix memory leaks when using object_property_get_str()

# gpg: Signature made Tue 03 Apr 2018 15:00:10 BST
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-next-pull-request:
  sev/i386: fix memory leak in sev_guest_init()
  exec: fix memory leak in find_max_supported_pagesize()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2018-04-04 11:13:52 +01:00
parent 71ad102baa 5d7bc72a43
commit 094b62cd9c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
exec.c
View File

@@ -1495,6 +1495,7 @@ static int find_max_supported_pagesize(Object *obj, void *opaque)
mem_path = object_property_get_str(obj, "mem-path", NULL); mem_path = object_property_get_str(obj, "mem-path", NULL);
if (mem_path) { if (mem_path) {
long hpsize = qemu_mempath_getpagesize(mem_path); long hpsize = qemu_mempath_getpagesize(mem_path);
g_free(mem_path);
if (hpsize < *hpsize_min) { if (hpsize < *hpsize_min) {
*hpsize_min = hpsize; *hpsize_min = hpsize;
} }

4
target/i386/sev.c
View File

@@ -748,9 +748,11 @@ sev_guest_init(const char *id)
if (s->sev_fd < 0) { if (s->sev_fd < 0) {
error_report("%s: Failed to open %s '%s'", __func__, error_report("%s: Failed to open %s '%s'", __func__,
devname, strerror(errno)); devname, strerror(errno));
goto err;
} }
g_free(devname); g_free(devname);
if (s->sev_fd < 0) {
goto err;
}
ret = sev_platform_ioctl(s->sev_fd, SEV_PLATFORM_STATUS, &status, ret = sev_platform_ioctl(s->sev_fd, SEV_PLATFORM_STATUS, &status,
&fw_error); &fw_error);