From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: Kostiantyn Kostiuk <konstantin@daynix.com>
Cc: "Michael Roth" <michael.roth@amd.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-devel <qemu-devel@nongnu.org>
Subject: Re: [PATCH 3/5] gqa-win: get_pci_info: Free parent_dev_info properly
Date: Mon, 13 Dec 2021 23:40:29 +0400 [thread overview]
Message-ID: <CAMxuvaxFNq3bfew1gqoxRB5eWvqK9yUqCBZPU9MfeBCVvuRreg@mail.gmail.com> (raw)
In-Reply-To: <20211213111554.62394-4-konstantin@daynix.com>
On Mon, Dec 13, 2021 at 3:16 PM Kostiantyn Kostiuk
<konstantin@daynix.com> wrote:
>
> In case when the function fails to get parent device data,
> the parent_dev_info variable will be initialized, but not freed.
>
> Signed-off-by: Kostiantyn Kostiuk <kkostiuk@redhat.com>
> Signed-off-by: Kostiantyn Kostiuk <konstantin@daynix.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> qga/commands-win32.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 12f7a88078..cef14a8762 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -515,6 +515,8 @@ DEFINE_GUID(GUID_DEVINTERFACE_STORAGEPORT,
> static GuestPCIAddress *get_pci_info(int number, Error **errp)
> {
> HDEVINFO dev_info = INVALID_HANDLE_VALUE;
> + HDEVINFO parent_dev_info = INVALID_HANDLE_VALUE;
> +
> SP_DEVINFO_DATA dev_info_data;
> SP_DEVICE_INTERFACE_DATA dev_iface_data;
> HANDLE dev_file;
> @@ -542,7 +544,6 @@ static GuestPCIAddress *get_pci_info(int number, Error **errp)
> PSP_DEVICE_INTERFACE_DETAIL_DATA pdev_iface_detail_data = NULL;
> STORAGE_DEVICE_NUMBER sdn;
> char *parent_dev_id = NULL;
> - HDEVINFO parent_dev_info;
> SP_DEVINFO_DATA parent_dev_info_data;
> DWORD j;
> DWORD size = 0;
> @@ -744,11 +745,13 @@ static GuestPCIAddress *get_pci_info(int number, Error **errp)
> break;
> }
> }
> - SetupDiDestroyDeviceInfoList(parent_dev_info);
> break;
> }
>
> cleanup:
> + if (parent_dev_info != INVALID_HANDLE_VALUE) {
> + SetupDiDestroyDeviceInfoList(parent_dev_info);
> + }
> if (dev_info != INVALID_HANDLE_VALUE) {
> SetupDiDestroyDeviceInfoList(dev_info);
> }
> --
> 2.25.1
>
next prev parent reply other threads:[~2021-12-13 19:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 11:15 [PATCH 0/5] gqa-win: get_pci_info: Fix memory leak Kostiantyn Kostiuk
2021-12-13 11:15 ` [PATCH 1/5] gqa-win: get_pci_info: Clean dev_info if handle is valid Kostiantyn Kostiuk
2021-12-13 19:37 ` Marc-André Lureau
2021-12-13 11:15 ` [PATCH 2/5] gqa-win: get_pci_info: Use common 'cleanup' label Kostiantyn Kostiuk
2021-12-13 19:39 ` Marc-André Lureau
2021-12-13 11:15 ` [PATCH 3/5] gqa-win: get_pci_info: Free parent_dev_info properly Kostiantyn Kostiuk
2021-12-13 19:40 ` Marc-André Lureau [this message]
2021-12-13 11:15 ` [PATCH 4/5] gqa-win: get_pci_info: Replace 'while' with 2 calls of the function Kostiantyn Kostiuk
2021-12-13 19:45 ` Marc-André Lureau
2021-12-13 11:15 ` [PATCH 5/5] gqa-win: get_pci_info: Add g_autofree for few variables Kostiantyn Kostiuk
2021-12-13 19:50 ` Marc-André Lureau
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=CAMxuvaxFNq3bfew1gqoxRB5eWvqK9yUqCBZPU9MfeBCVvuRreg@mail.gmail.com \
--to=marcandre.lureau@redhat.com \
--cc=konstantin@daynix.com \
--cc=michael.roth@amd.com \
--cc=philmd@redhat.com \
--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).