qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 12/20] contrib/elf2dmp: Always destroy PA space
Date: Mon, 11 Mar 2024 19:12:33 +0000	[thread overview]
Message-ID: <20240311191241.4177990-13-peter.maydell@linaro.org> (raw)
In-Reply-To: <20240311191241.4177990-1-peter.maydell@linaro.org>

From: Akihiko Odaki <akihiko.odaki@daynix.com>

Destroy PA space even if paging base couldn't be found, fixing memory
leak.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Viktor Prutyanov <viktor.prutyanov@phystech.edu>
Message-id: 20240307-elf2dmp-v4-11-4f324ad4d99d@daynix.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 contrib/elf2dmp/main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c
index 9347b0cd5a2..32dc8bac6a3 100644
--- a/contrib/elf2dmp/main.c
+++ b/contrib/elf2dmp/main.c
@@ -549,7 +549,7 @@ int main(int argc, char *argv[])
     va_space_create(&vs, &ps, state->cr[3]);
     if (!fix_dtb(&vs, &qemu_elf)) {
         eprintf("Failed to find paging base\n");
-        goto out_elf;
+        goto out_ps;
     }
 
     printf("CPU #0 IDT is at 0x%016"PRIx64"\n", state->idt.base);
@@ -634,7 +634,6 @@ out_pdb_file:
     unlink(PDB_NAME);
 out_ps:
     pa_space_destroy(&ps);
-out_elf:
     QEMU_Elf_exit(&qemu_elf);
 
     return err;
-- 
2.34.1



  parent reply	other threads:[~2024-03-11 19:24 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-11 19:12 [PULL 00/20] target-arm queue Peter Maydell
2024-03-11 19:12 ` [PULL 01/20] hw/arm: Deprecate various old Arm machine types Peter Maydell
2024-03-11 19:12 ` [PULL 02/20] contrib/elf2dmp: Remove unnecessary err flags Peter Maydell
2024-03-11 19:12 ` [PULL 03/20] contrib/elf2dmp: Assume error by default Peter Maydell
2024-03-11 19:12 ` [PULL 04/20] contrib/elf2dmp: Continue even contexts are lacking Peter Maydell
2024-03-11 19:12 ` [PULL 05/20] contrib/elf2dmp: Change pa_space_create() signature Peter Maydell
2024-03-11 19:12 ` [PULL 06/20] contrib/elf2dmp: Fix error reporting style in addrspace.c Peter Maydell
2024-03-11 19:12 ` [PULL 07/20] contrib/elf2dmp: Fix error reporting style in download.c Peter Maydell
2024-03-11 19:12 ` [PULL 08/20] contrib/elf2dmp: Fix error reporting style in pdb.c Peter Maydell
2024-03-11 19:12 ` [PULL 09/20] contrib/elf2dmp: Fix error reporting style in qemu_elf.c Peter Maydell
2024-03-11 19:12 ` [PULL 10/20] contrib/elf2dmp: Fix error reporting style in main.c Peter Maydell
2024-03-11 19:12 ` [PULL 11/20] contrib/elf2dmp: Always check for PA resolution failure Peter Maydell
2024-03-11 19:12 ` Peter Maydell [this message]
2024-03-11 19:12 ` [PULL 13/20] contrib/elf2dmp: Ensure segment fits in file Peter Maydell
2024-03-11 19:12 ` [PULL 14/20] contrib/elf2dmp: Use lduw_le_p() to read PDB Peter Maydell
2024-03-11 19:12 ` [PULL 15/20] contrib/elf2dmp: Use rol64() to decode Peter Maydell
2024-03-11 19:12 ` [PULL 16/20] MAINTAINERS: Add Akihiko Odaki as a elf2dmp reviewer Peter Maydell
2024-03-11 19:12 ` [PULL 17/20] contrib/elf2dmp: Use GPtrArray Peter Maydell
2024-03-11 19:12 ` [PULL 18/20] contrib/elf2dmp: Clamp QEMU note to file size Peter Maydell
2024-03-11 19:12 ` [PULL 19/20] contrib/elf2dmp: Ensure phdrs fit in file Peter Maydell
2024-03-11 19:12 ` [PULL 20/20] docs: update copyright date to the year 2024 Peter Maydell
2024-03-12 13:07 ` [PULL 00/20] target-arm queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240311191241.4177990-13-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).