From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsdXs-0002UU-Sk for qemu-devel@nongnu.org; Thu, 05 Jun 2014 15:42:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsdXe-0000n4-I5 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 15:41:52 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:50749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsdXe-0000mq-9s for qemu-devel@nongnu.org; Thu, 05 Jun 2014 15:41:38 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 5 Jun 2014 13:41:37 -0600 From: Michael Roth Date: Thu, 5 Jun 2014 14:41:24 -0500 Message-Id: <1401997284-31038-2-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1401997284-31038-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1401997284-31038-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] qga: Fix handle fd leak in acquire_privilege() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, arei.gonglei@huawei.com, qemu-stable@nongnu.org From: Gonglei token should be closed in all conditions. So move CloseHandle(token) to "out" branch. Signed-off-by: Wang Rui Signed-off-by: Gonglei Signed-off-by: Michael Roth --- qga/commands-win32.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index d793dd0..e769396 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -31,7 +31,7 @@ static void acquire_privilege(const char *name, Error **errp) { - HANDLE token; + HANDLE token = NULL; TOKEN_PRIVILEGES priv; Error *local_err = NULL; @@ -53,13 +53,15 @@ static void acquire_privilege(const char *name, Error **errp) goto out; } - CloseHandle(token); } else { error_set(&local_err, QERR_QGA_COMMAND_FAILED, "failed to open privilege token"); } out: + if (token) { + CloseHandle(token); + } if (local_err) { error_propagate(errp, local_err); } -- 1.9.1