From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57570)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1WmpY1-0005w2-MJ
	for qemu-devel@nongnu.org; Tue, 20 May 2014 15:18:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1WmpXv-0001mL-Ox
	for qemu-devel@nongnu.org; Tue, 20 May 2014 15:18:01 -0400
Received: from mx1.redhat.com ([209.132.183.28]:34195)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1WmpXv-0001mC-I1
	for qemu-devel@nongnu.org; Tue, 20 May 2014 15:17:55 -0400
Date: Tue, 20 May 2014 15:17:42 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20140520151742.6343af19@redhat.com>
In-Reply-To: <1400484363-4744-1-git-send-email-arei.gonglei@huawei.com>
References: <1400484363-4744-1-git-send-email-arei.gonglei@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] qga: Fix handle fd leak in
	acquire_privilege()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: mdroth@linux.vnet.ibm.com, Wang Rui <moon.wangrui@huawei.com>
Cc: arei.gonglei@huawei.com, qemu-devel@nongnu.org, armbru@redhat.com

On Mon, 19 May 2014 15:26:03 +0800
<arei.gonglei@huawei.com> wrote:

> From: Gonglei <arei.gonglei@huawei.com>
> 
> token should be closed in all conditions.
> So move CloseHandle(token) to "out" branch.

Looks good to me. Michael, are you going to pick this one?

> 
> Signed-off-by: Wang Rui <moon.wangrui@huawei.com>
> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> ---
>  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);
>      }