From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: lvivier@redhat.com, thuth@redhat.com, berrange@redhat.com,
ehabkost@redhat.com, Li Qiang <liq3ea@163.com>,
pbonzini@redhat.com, alex.bennee@linaro.org
Subject: Re: [PATCH for-5.1 2/5] qom: Plug memory leak in "info qom-tree"
Date: Tue, 14 Jul 2020 18:46:39 +0200 [thread overview]
Message-ID: <e87a1f33-2365-c6d0-0288-4017a8d494c2@redhat.com> (raw)
In-Reply-To: <20200714160202.3121879-3-armbru@redhat.com>
On 7/14/20 6:01 PM, Markus Armbruster wrote:
> Commit e8c9e65816 "qom: Make "info qom-tree" show children sorted"
> created a memory leak, because I didn't realize
> object_get_canonical_path_component()'s value needs to be freed.
>
> Reproducer:
>
> $ qemu-system-x86_64 -nodefaults -display none -S -monitor stdio
> QEMU 5.0.50 monitor - type 'help' for more information
> (qemu) info qom-tree
>
> This leaks some 4500 path components, 12-13 characters on average,
> i.e. roughly 100kBytes depending on the allocator. A couple of
> hundred "info qom-tree" here, a couple of hundred there, and soon
> enough we're talking about real memory.
>
> Plug the leak.
>
> Fixes: e8c9e65816f5dbfe18ad3b2be938d0d8192d459a
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> qom/qom-hmp-cmds.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c
> index 9ed8bb1c9f..aaacadacca 100644
> --- a/qom/qom-hmp-cmds.c
> +++ b/qom/qom-hmp-cmds.c
> @@ -96,8 +96,10 @@ static void print_qom_composition(Monitor *mon, Object *obj, int indent);
>
> static int qom_composition_compare(const void *a, const void *b, void *ignore)
> {
> - return g_strcmp0(a ? object_get_canonical_path_component(a) : NULL,
> - b ? object_get_canonical_path_component(b) : NULL);
> + g_autofree char *ac = object_get_canonical_path_component(a);
> + g_autofree char *bc = object_get_canonical_path_component(b);
> +
> + return g_strcmp0(ac, bc);
> }
>
> static int insert_qom_composition_child(Object *obj, void *opaque)
>
Li Qiang set this too:
https://lists.gnu.org/archive/html/qemu-devel/2020-07/msg04732.html
next prev parent reply other threads:[~2020-07-14 16:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 16:01 [PATCH for-5.1 0/5] qom: HMP command fixes Markus Armbruster
2020-07-14 16:01 ` [PATCH for-5.1 1/5] qdev: Fix device_add DRIVER, help to print to monitor Markus Armbruster
2020-07-14 16:22 ` Philippe Mathieu-Daudé
2020-07-15 15:18 ` Li Qiang
2020-07-21 15:17 ` Dr. David Alan Gilbert
2020-07-14 16:01 ` [PATCH for-5.1 2/5] qom: Plug memory leak in "info qom-tree" Markus Armbruster
2020-07-14 16:16 ` Philippe Mathieu-Daudé
2020-07-14 16:46 ` Philippe Mathieu-Daudé [this message]
2020-07-15 15:19 ` Li Qiang
2020-07-16 9:05 ` Thomas Huth
2020-07-14 16:02 ` [PATCH for-5.1 3/5] qom: Change object_get_canonical_path_component() not to malloc Markus Armbruster
2020-07-14 16:21 ` Philippe Mathieu-Daudé
2020-07-15 15:26 ` Li Qiang
2020-07-14 16:02 ` [PATCH for-5.1 4/5] qom: Document object_get_canonical_path() returns malloced string Markus Armbruster
2020-07-14 16:23 ` Philippe Mathieu-Daudé
2020-07-14 16:02 ` [PATCH for-5.1 5/5] qom: Make info qom-tree sort children more efficiently Markus Armbruster
2020-07-21 15:32 ` Dr. David Alan Gilbert
2020-07-21 15:39 ` Markus Armbruster
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=e87a1f33-2365-c6d0-0288-4017a8d494c2@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=liq3ea@163.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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).