qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
	"Zhenzhong Duan" <zhenzhong.duan@intel.com>,
	"Cédric Le Goater" <clg@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 8/9] vfio/display: Fix potential memleak of edid info
Date: Tue,  9 Jul 2024 13:50:16 +0200	[thread overview]
Message-ID: <20240709115017.798043-9-clg@redhat.com> (raw)
In-Reply-To: <20240709115017.798043-1-clg@redhat.com>

From: Zhenzhong Duan <zhenzhong.duan@intel.com>

EDID related device region info is leaked in vfio_display_edid_init()
error path and VFIODisplay destroying path.

Fixes: 08479114b0de ("vfio/display: add edid support.")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/vfio/display.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index 661e921616f4b85613d5f6053c30348a4ee6cbd2..9c57fd388886100bf9eae061def39688d33a8695 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -171,7 +171,9 @@ static void vfio_display_edid_init(VFIOPCIDevice *vdev)
 
 err:
     trace_vfio_display_edid_write_error();
+    g_free(dpy->edid_info);
     g_free(dpy->edid_regs);
+    dpy->edid_info = NULL;
     dpy->edid_regs = NULL;
     return;
 }
@@ -182,6 +184,7 @@ static void vfio_display_edid_exit(VFIODisplay *dpy)
         return;
     }
 
+    g_free(dpy->edid_info);
     g_free(dpy->edid_regs);
     g_free(dpy->edid_blob);
     timer_free(dpy->edid_link_timer);
-- 
2.45.2



  parent reply	other threads:[~2024-07-09 11:52 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-09 11:50 [PULL 0/9] vfio queue Cédric Le Goater
2024-07-09 11:50 ` [PULL 1/9] virtio-iommu: Fix error handling in virtio_iommu_set_host_iova_ranges() Cédric Le Goater
2024-07-09 11:50 ` [PULL 2/9] vfio-container-base: Introduce vfio_container_get_iova_ranges() helper Cédric Le Goater
2024-07-09 11:50 ` [PULL 3/9] HostIOMMUDevice : remove Error handle from get_iova_ranges callback Cédric Le Goater
2024-07-09 11:50 ` [PULL 4/9] HostIOMMUDevice: Introduce get_page_size_mask() callback Cédric Le Goater
2024-07-09 11:50 ` [PULL 5/9] virtio-iommu : Retrieve page size mask on virtio_iommu_set_iommu_device() Cédric Le Goater
2024-07-09 11:50 ` [PULL 6/9] memory: remove IOMMU MR iommu_set_page_size_mask() callback Cédric Le Goater
2024-07-09 11:50 ` [PULL 7/9] virtio-iommu: Revert transient enablement of IOMMU MR in bypass mode Cédric Le Goater
2024-07-09 11:50 ` Cédric Le Goater [this message]
2024-07-09 11:50 ` [PULL 9/9] vfio/display: Fix vfio_display_edid_init() error path Cédric Le Goater
2024-07-09 17:26 ` [PULL 0/9] vfio queue Richard Henderson

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=20240709115017.798043-9-clg@redhat.com \
    --to=clg@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=zhenzhong.duan@intel.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).