diff mbox

[PATCHv2,2/6] qemu-ga: don't leak a file descriptor upon failed lockf

Message ID 87wr4bubdg.fsf_-_@rho.meyering.net
State New
Headers show

Commit Message

Jim Meyering May 16, 2012, 8:19 p.m. UTC 
Signed-off-by: Jim Meyering <meyering@redhat.com>
---

 qemu-ga.c | 3 +++
 1 file changed, 3 insertions(+)

--
1.7.10.2.520.g6a4a482

Comments

Michael Roth May 16, 2012, 8:58 p.m. UTC | #1 
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
>
diff mbox

Patch

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;
     }