qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Farman <farman@linux.ibm.com>
To: Cornelia Huck <cohuck@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>,
	qemu-s390x@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH] vfio-ccw: plug memory leak while getting region info
Date: Mon, 28 Sep 2020 06:42:22 -0400	[thread overview]
Message-ID: <b62f039a-642d-4371-3a4c-f9461ae3575c@linux.ibm.com> (raw)
In-Reply-To: <20200928101701.13540-1-cohuck@redhat.com>



On 9/28/20 6:17 AM, Cornelia Huck wrote:
> vfio_get_dev_region_info() unconditionally allocates memory
> for a passed-in vfio_region_info structure (and does not re-use
> an already allocated structure). Therefore, we have to free
> the structure we pass to that function in vfio_ccw_get_region()
> for every region we successfully obtained information for.

Ah, yes. This makes sense. A little messy, but hopefully we're done with
new regions for the time being.

> 
> Reported-by: Alex Williamson <alex.williamson@redhat.com>
> Fixes: 8fadea24de4e ("vfio-ccw: support async command subregion")
> Fixes: 46ea3841edaf ("vfio-ccw: Add support for the schib region")
> Fixes: f030532f2ad6 ("vfio-ccw: Add support for the CRW region and IRQ")
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Reviewed-by: Eric Farman <farman@linux.ibm.com>

> ---
>  hw/vfio/ccw.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> index ff7f36977994..d2755d7fc5ca 100644
> --- a/hw/vfio/ccw.c
> +++ b/hw/vfio/ccw.c
> @@ -491,6 +491,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)
>  
>      vcdev->io_region_offset = info->offset;
>      vcdev->io_region = g_malloc0(info->size);
> +    g_free(info);
>  
>      /* check for the optional async command region */
>      ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW,
> @@ -503,6 +504,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)
>          }
>          vcdev->async_cmd_region_offset = info->offset;
>          vcdev->async_cmd_region = g_malloc0(info->size);
> +        g_free(info);
>      }
>  
>      ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW,
> @@ -515,6 +517,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)
>          }
>          vcdev->schib_region_offset = info->offset;
>          vcdev->schib_region = g_malloc(info->size);
> +        g_free(info);
>      }
>  
>      ret = vfio_get_dev_region_info(vdev, VFIO_REGION_TYPE_CCW,
> @@ -528,9 +531,9 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)
>          }
>          vcdev->crw_region_offset = info->offset;
>          vcdev->crw_region = g_malloc(info->size);
> +        g_free(info);
>      }
>  
> -    g_free(info);
>      return;
>  
>  out_err:
> 


  reply	other threads:[~2020-09-28 10:43 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-28 10:17 [PATCH] vfio-ccw: plug memory leak while getting region info Cornelia Huck
2020-09-28 10:42 ` Eric Farman [this message]
2020-09-28 11:41 ` Philippe Mathieu-Daudé
2020-09-29 10:12 ` Cornelia Huck

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=b62f039a-642d-4371-3a4c-f9461ae3575c@linux.ibm.com \
    --to=farman@linux.ibm.com \
    --cc=alex.williamson@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@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).