From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:42485)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1SUlJ5-0000jb-Pl
	for qemu-devel@nongnu.org; Wed, 16 May 2012 16:58:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1SUlJ4-00008h-3Y
	for qemu-devel@nongnu.org; Wed, 16 May 2012 16:58:51 -0400
Received: from mail-pz0-f45.google.com ([209.85.210.45]:34916)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1SUlJ3-00008V-Qv
	for qemu-devel@nongnu.org; Wed, 16 May 2012 16:58:50 -0400
Received: by dadv2 with SMTP id v2so1925356dad.4
	for <qemu-devel@nongnu.org>; Wed, 16 May 2012 13:58:47 -0700 (PDT)
Sender: fluxion <flukshun@gmail.com>
Date: Wed, 16 May 2012 15:58:42 -0500
From: Michael Roth <mdroth@linux.vnet.ibm.com>
Message-ID: <20120516205842.GD2967@illuin>
References: <1337173681-25891-1-git-send-email-jim@meyering.net>
	<1337173681-25891-3-git-send-email-jim@meyering.net>
	<87wr4bubdg.fsf_-_@rho.meyering.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87wr4bubdg.fsf_-_@rho.meyering.net>
Subject: Re: [Qemu-devel] [PATCHv2 2/6] qemu-ga: don't leak a file
 descriptor upon failed lockf
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: Jim Meyering <jim@meyering.net>
Cc: Stefan Weil <sw@weilnetz.de>, Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>, Luiz Capitulino <lcapitulino@redhat.com>

On Wed, May 16, 2012 at 10:19:55PM +0200, Jim Meyering wrote:
> 
> Signed-off-by: Jim Meyering <meyering@redhat.com>

Acked-by: Michael Roth <mdroth@linux.vnet.ibm.com>

> ---
> 
>  qemu-ga.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/qemu-ga.c b/qemu-ga.c
> index 680997e..24b236a 100644
> --- a/qemu-ga.c
> +++ b/qemu-ga.c
> @@ -246,6 +246,9 @@ static bool ga_open_pidfile(const char *pidfile)
>      pidfd = open(pidfile, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
>      if (pidfd == -1 || lockf(pidfd, F_TLOCK, 0)) {
>          g_critical("Cannot lock pid file, %s", strerror(errno));
> +        if (pidfd != -1) {
> +            close(pidfd);
> +        }
>          return false;
>      }
> 
> --
> 1.7.10.2.520.g6a4a482
>