qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Basil Salman <basil@daynix.com>
To: qemu-devel@nongnu.org, Michael Roth <michael.roth@amd.com>
Cc: Yan Vugenfirer <yan@daynix.com>,
	Kostiantyn Kostiuk <konstantin@daynix.com>
Subject: [PATCH 2/3] qga-win: Fix build_guest_fsinfo() close of nonexistent handle
Date: Mon,  5 Apr 2021 16:14:19 +0300	[thread overview]
Message-ID: <20210405131420.598273-2-basil@daynix.com> (raw)
In-Reply-To: <20210405131420.598273-1-basil@daynix.com>

On the current error path of build_guest_fsinfo(), a non existent
handle is passed to CloseHandle().
This patch add initialization of hLocalDiskHandle to INVALID_HANDLE_VALUE,
and checks for handle validity before the handle is closed.

Signed-off-by: Basil Salman <basil@daynix.com>
Signed-off-by: Basil Salman <basil@redhat.com>
---
 qga/commands-win32.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 27baf17d6c..d51833ef15 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -1091,7 +1091,7 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp)
     size_t len;
     uint64_t i64FreeBytesToCaller, i64TotalBytes, i64FreeBytes;
     GuestFilesystemInfo *fs = NULL;
-    HANDLE hLocalDiskHandle = NULL;
+    HANDLE hLocalDiskHandle = INVALID_HANDLE_VALUE;
 
     GetVolumePathNamesForVolumeName(guid, (LPCH)&mnt, 0, &info_size);
     if (GetLastError() != ERROR_MORE_DATA) {
@@ -1149,7 +1149,8 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp)
     fs->type = g_strdup(fs_name);
     fs->disk = build_guest_disk_info(guid, errp);
 free:
-    CloseHandle(hLocalDiskHandle);
+    if (hLocalDiskHandle != INVALID_HANDLE_VALUE) {
+        CloseHandle(hLocalDiskHandle);
+    }
     g_free(mnt_point);
     return fs;
 }
-- 
2.17.2



  reply	other threads:[~2021-04-05 13:16 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-05 13:14 [PATCH 1/3] qga-win: Increase VSS freeze timeout to 60 secs instead of 10 Basil Salman
2021-04-05 13:14 ` Basil Salman [this message]
2021-04-05 13:14 ` [PATCH 3/3] qga-win: Fix handle leak in ga_get_win_product_name() Basil Salman
2021-04-22  7:43 ` [PATCH 1/3] qga-win: Increase VSS freeze timeout to 60 secs instead of 10 Konstantin Kostiuk
2021-04-29  8:51   ` Konstantin Kostiuk
2021-07-13 18:40   ` Michael Roth
2021-07-14  6:17     ` Konstantin Kostiuk
2021-07-28  7:53       ` Konstantin Kostiuk
2021-05-28 11:21 ` Konstantin Kostiuk
2021-06-11  6:56 ` Konstantin Kostiuk
2021-07-04  5:52 ` Konstantin Kostiuk
2021-07-11 17:18   ` Konstantin Kostiuk

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=20210405131420.598273-2-basil@daynix.com \
    --to=basil@daynix.com \
    --cc=konstantin@daynix.com \
    --cc=michael.roth@amd.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yan@daynix.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).