From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 8 Jul 2021 19:27:22 +0000 (+0100)
Subject: Fix double close of vhost_fd on error
X-Git-Tag: v8.20~102
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e6a20f33eb7e4f68bb7499d972b84249b39e4148;p=users%2Fdwmw2%2Fopenconnect.git

Fix double close of vhost_fd on error

Spotted by Coverity.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/vhost.c b/vhost.c
index a311d9ff..94827675 100644
--- a/vhost.c
+++ b/vhost.c
@@ -114,7 +114,6 @@ static int setup_vring(struct openconnect_info *vpninfo, int idx)
 		ret = -errno;
 		vpn_progress(vpninfo, PRG_ERR, _("Failed to set vring #%d call eventfd: %s\n"),
 			     idx, strerror(-ret));
-		close(vpninfo->vhost_fd);
 		return ret;
 	}
 
@@ -123,12 +122,12 @@ static int setup_vring(struct openconnect_info *vpninfo, int idx)
 		ret = -errno;
 		vpn_progress(vpninfo, PRG_ERR, _("Failed to set vring #%d kick eventfd: %s\n"),
 			     idx, strerror(-ret));
-		close(vpninfo->vhost_fd);
 		return ret;
 	}
 
 	return 0;
 }
+
 #define OC_VHOST_NET_FEATURES ((1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |	\
 			       (1ULL << VIRTIO_F_VERSION_1) |		\
 			       (1ULL << VIRTIO_RING_F_EVENT_IDX))