From 5a877d1d7f3de5ba826a5d1f849fde7ec5f89827 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikma@users.sourceforge.net>
Date: Tue, 21 Apr 2020 22:42:42 +0200
Subject: Wireguard: free sockets on error and eof

---
 sysdep/unix/wg_user.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'sysdep')

diff --git a/sysdep/unix/wg_user.c b/sysdep/unix/wg_user.c
index 49f6d89c..db92ea8e 100644
--- a/sysdep/unix/wg_user.c
+++ b/sysdep/unix/wg_user.c
@@ -54,9 +54,7 @@ void user_err_hook(struct birdsock *bs, int err)
   /*   return; */
 
   log(L_TRACE "WG: ERR %p %d %s", bs, err, bs->err);
-  if (bs->fd >= 0)
-    close(bs->fd);
-  bs->fd = -1;
+  rfree(bs);
 }
 
 static void
@@ -222,7 +220,10 @@ wg_user_set_device(struct pool *pool,
   int res = sk_connect_unix(sock, path);
   DBG(L_TRACE "WG: socket %d %d %s", res, sock->fd, path);
   if (res < 0)
-    return -1;
+    {
+      rfree(sock);
+      return -1;
+    }
 
   uint tbsize = 8192;
   sk_set_tbsize(sock, tbsize);
@@ -235,7 +236,7 @@ wg_user_set_device(struct pool *pool,
 
   if (len < 0)
     {
-      /* FIXME close */
+      rfree(sock);
       return -1;
     }
   res = sk_send(sock, tbsize - size);
-- 
cgit v1.2.3