qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Amos Kong <akong@redhat.com>
Cc: vyasevic@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com
Subject: Re: [Qemu-devel] [PATCH] virtio-net: fix the memory leak in rxfilter_notify()
Date: Mon, 18 Nov 2013 15:55:08 +0200	[thread overview]
Message-ID: <20131118135508.GA7233@redhat.com> (raw)
In-Reply-To: <1384782445-26527-1-git-send-email-akong@redhat.com>

On Mon, Nov 18, 2013 at 09:47:25PM +0800, Amos Kong wrote:
> object_get_canonical_path() returns a gchar*, it should be freeed by the
> caller.
> 
> Signed-off-by: Amos Kong <akong@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  hw/net/virtio-net.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index 613f144..2b2fb57 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -198,15 +198,14 @@ static void rxfilter_notify(NetClientState *nc)
>  {
>      QObject *event_data;
>      VirtIONet *n = qemu_get_nic_opaque(nc);
> +    gchar *path = object_get_canonical_path(OBJECT(n->qdev));
>  
>      if (nc->rxfilter_notify_enabled) {

It would be a bit nicer to put gchar *path within this scope.

>          if (n->netclient_name) {
>              event_data = qobject_from_jsonf("{ 'name': %s, 'path': %s }",
> -                                    n->netclient_name,
> -                                    object_get_canonical_path(OBJECT(n->qdev)));
> +                                    n->netclient_name, path);
>          } else {
> -            event_data = qobject_from_jsonf("{ 'path': %s }",
> -                                    object_get_canonical_path(OBJECT(n->qdev)));
> +            event_data = qobject_from_jsonf("{ 'path': %s }", path);
>          }
>          monitor_protocol_event(QEVENT_NIC_RX_FILTER_CHANGED, event_data);
>          qobject_decref(event_data);
> @@ -214,6 +213,7 @@ static void rxfilter_notify(NetClientState *nc)
>          /* disable event notification to avoid events flooding */
>          nc->rxfilter_notify_enabled = 0;
>      }
> +    g_free(path);
>  }
>  
>  static char *mac_strdup_printf(const uint8_t *mac)
> -- 
> 1.8.3.1

  parent reply	other threads:[~2013-11-18 13:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-18 13:47 [Qemu-devel] [PATCH] virtio-net: fix the memory leak in rxfilter_notify() Amos Kong
2013-11-18 13:54 ` Vlad Yasevich
2013-11-18 13:55 ` Michael S. Tsirkin [this message]
2013-11-18 15:14 ` Stefan Hajnoczi
2013-11-18 15:20   ` Michael S. Tsirkin
2013-11-19  8:44     ` Stefan Hajnoczi

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=20131118135508.GA7233@redhat.com \
    --to=mst@redhat.com \
    --cc=akong@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=vyasevic@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).