[Qemu-devel] [PULL 0/2] Fix memory leaks when using object_property_get_str()

[Qemu-devel] [PULL 0/2] Fix memory leaks when using object_property_get_str()

[Eduardo Habkost]

The following changes since commit f184de7553272223d6af731d7d623a7cebf710b5:

  Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-critical-fixes' into staging (2018-03-31 09:42:33 +0100)

are available in the Git repository at:

  git://github.com/ehabkost/qemu.git tags/x86-next-pull-request

for you to fetch changes up to 5d7bc72a4336f922ba42bab545529051c706ac4b:

  sev/i386: fix memory leak in sev_guest_init() (2018-04-02 23:05:26 -0300)

----------------------------------------------------------------
Fix memory leaks when using object_property_get_str()

----------------------------------------------------------------

Greg Kurz (2):
  exec: fix memory leak in find_max_supported_pagesize()
  sev/i386: fix memory leak in sev_guest_init()

 exec.c            | 1 +
 target/i386/sev.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

-- 
2.14.3

[Qemu-devel] [PULL 1/2] exec: fix memory leak in find_max_supported_pagesize()

[Eduardo Habkost]

From: Greg Kurz <groug@kaod.org>

The string returned by object_property_get_str() is dynamically allocated.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <152231458624.69730.1752893648612848392.stgit@bahia.lan>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 exec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exec.c b/exec.c
index c09bd93df3..02b1efebb7 100644
--- a/exec.c
+++ b/exec.c
@@ -1495,6 +1495,7 @@ static int find_max_supported_pagesize(Object *obj, void *opaque)
         mem_path = object_property_get_str(obj, "mem-path", NULL);
         if (mem_path) {
             long hpsize = qemu_mempath_getpagesize(mem_path);
+            g_free(mem_path);
             if (hpsize < *hpsize_min) {
                 *hpsize_min = hpsize;
             }
-- 
2.14.3

[Qemu-devel] [PULL 2/2] sev/i386: fix memory leak in sev_guest_init()

[Eduardo Habkost]

From: Greg Kurz <groug@kaod.org>

The string returned by object_property_get_str() is dynamically allocated.

Fixes: d8575c6c0242b
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <152231462116.69730.14119625999092384450.stgit@bahia.lan>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 target/i386/sev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/i386/sev.c b/target/i386/sev.c
index 019d84cef2..c01167143f 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -748,9 +748,11 @@ sev_guest_init(const char *id)
     if (s->sev_fd < 0) {
         error_report("%s: Failed to open %s '%s'", __func__,
                      devname, strerror(errno));
-        goto err;
     }
     g_free(devname);
+    if (s->sev_fd < 0) {
+        goto err;
+    }
 
     ret = sev_platform_ioctl(s->sev_fd, SEV_PLATFORM_STATUS, &status,
                              &fw_error);
-- 
2.14.3

Re: [Qemu-devel] [PULL 0/2] Fix memory leaks when using object_property_get_str()

[Peter Maydell]

On 3 April 2018 at 15:01, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The following changes since commit f184de7553272223d6af731d7d623a7cebf710b5:
>
>   Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-critical-fixes' into staging (2018-03-31 09:42:33 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/ehabkost/qemu.git tags/x86-next-pull-request
>
> for you to fetch changes up to 5d7bc72a4336f922ba42bab545529051c706ac4b:
>
>   sev/i386: fix memory leak in sev_guest_init() (2018-04-02 23:05:26 -0300)
>
> ----------------------------------------------------------------
> Fix memory leaks when using object_property_get_str()
>
> ----------------------------------------------------------------
>
> Greg Kurz (2):
>   exec: fix memory leak in find_max_supported_pagesize()
>   sev/i386: fix memory leak in sev_guest_init()
>
>  exec.c            | 1 +
>  target/i386/sev.c | 4 +++-
>  2 files changed, 4 insertions(+), 1 deletion(-)
>

Applied, thanks.

-- PMM