* [Qemu-devel] [PATCH] qga-win: fix leaks of build_guest_disk_info()
@ 2018-11-03 13:01 Marc-André Lureau
2018-11-04 22:30 ` Philippe Mathieu-Daudé
2018-11-09 14:38 ` Michael Roth
0 siblings, 2 replies; 3+ messages in thread
From: Marc-André Lureau @ 2018-11-03 13:01 UTC (permalink / raw)
To: qemu-devel; +Cc: tgolembi, mdroth, Marc-André Lureau
Introduced in commit b1ba8890e63ce9432c41c5c3fc229f54c87c9c99, vol_h
handle should be closed, and "out" cleanup should be done after
DeviceIoControl() fails.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qga/commands-win32.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index ef1d7d48d2..62e1b51dfe 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -797,7 +797,7 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
0, extents, size, NULL, NULL)) {
error_setg_win32(errp, GetLastError(),
"failed to get disk extents");
- return NULL;
+ goto out;
}
} else if (last_err == ERROR_INVALID_FUNCTION) {
/* Possibly CD-ROM or a shared drive. Try to pass the volume */
@@ -855,6 +855,9 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
out:
+ if (vol_h != INVALID_HANDLE_VALUE) {
+ CloseHandle(vol_h);
+ }
qapi_free_GuestDiskAddress(disk);
g_free(extents);
g_free(name);
--
2.19.1.708.g4ede3d42df
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] qga-win: fix leaks of build_guest_disk_info()
2018-11-03 13:01 [Qemu-devel] [PATCH] qga-win: fix leaks of build_guest_disk_info() Marc-André Lureau
@ 2018-11-04 22:30 ` Philippe Mathieu-Daudé
2018-11-09 14:38 ` Michael Roth
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2018-11-04 22:30 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel; +Cc: tgolembi, mdroth
On 3/11/18 14:01, Marc-André Lureau wrote:
> Introduced in commit b1ba8890e63ce9432c41c5c3fc229f54c87c9c99, vol_h
> handle should be closed, and "out" cleanup should be done after
> DeviceIoControl() fails.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> qga/commands-win32.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index ef1d7d48d2..62e1b51dfe 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -797,7 +797,7 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
> 0, extents, size, NULL, NULL)) {
> error_setg_win32(errp, GetLastError(),
> "failed to get disk extents");
> - return NULL;
> + goto out;
> }
> } else if (last_err == ERROR_INVALID_FUNCTION) {
> /* Possibly CD-ROM or a shared drive. Try to pass the volume */
> @@ -855,6 +855,9 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
>
>
> out:
> + if (vol_h != INVALID_HANDLE_VALUE) {
> + CloseHandle(vol_h);
> + }
> qapi_free_GuestDiskAddress(disk);
> g_free(extents);
> g_free(name);
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] qga-win: fix leaks of build_guest_disk_info()
2018-11-03 13:01 [Qemu-devel] [PATCH] qga-win: fix leaks of build_guest_disk_info() Marc-André Lureau
2018-11-04 22:30 ` Philippe Mathieu-Daudé
@ 2018-11-09 14:38 ` Michael Roth
1 sibling, 0 replies; 3+ messages in thread
From: Michael Roth @ 2018-11-09 14:38 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel; +Cc: tgolembi
Quoting Marc-André Lureau (2018-11-03 08:01:43)
> Introduced in commit b1ba8890e63ce9432c41c5c3fc229f54c87c9c99, vol_h
> handle should be closed, and "out" cleanup should be done after
> DeviceIoControl() fails.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Thanks, applied to qga tree:
https://github.com/mdroth/qemu/commits/qga
> ---
> qga/commands-win32.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index ef1d7d48d2..62e1b51dfe 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -797,7 +797,7 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
> 0, extents, size, NULL, NULL)) {
> error_setg_win32(errp, GetLastError(),
> "failed to get disk extents");
> - return NULL;
> + goto out;
> }
> } else if (last_err == ERROR_INVALID_FUNCTION) {
> /* Possibly CD-ROM or a shared drive. Try to pass the volume */
> @@ -855,6 +855,9 @@ static GuestDiskAddressList *build_guest_disk_info(char *guid, Error **errp)
>
>
> out:
> + if (vol_h != INVALID_HANDLE_VALUE) {
> + CloseHandle(vol_h);
> + }
> qapi_free_GuestDiskAddress(disk);
> g_free(extents);
> g_free(name);
> --
> 2.19.1.708.g4ede3d42df
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-09 14:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-03 13:01 [Qemu-devel] [PATCH] qga-win: fix leaks of build_guest_disk_info() Marc-André Lureau
2018-11-04 22:30 ` Philippe Mathieu-Daudé
2018-11-09 14:38 ` Michael Roth
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).