From: Andreas Färber <afaerber@suse.de>
Date: Mon, 15 Sep 2014 16:40:08 +0000 (+0200)
Subject: ivshmem: Fix fd leak on error
X-Git-Tag: v2.1.3~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4379ce8efe091bdc0eb3789a2e4eb83d4a2f6ae;p=thirdparty%2Fqemu.git

ivshmem: Fix fd leak on error

Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 3a31cff11203bf62ebafa6d74b1fcf2aba345eed)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index c3dc5c31795..7252f6481df 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -508,6 +508,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size)
     if (incoming_fd == -1) {
         fprintf(stderr, "could not allocate file descriptor %s\n",
                                                             strerror(errno));
+        close(tmp_fd);
         return;
     }