[PATCH] wireguard: Fix leaking sockets in wg_socket_init error paths

From: Daniel Gröber
Date: Mon Oct 23 2023 - 09:44:24 EST


This doesn't seem to be reachable normally, but while working on a patch
for the address binding code I ended up triggering this leak and had to
reboot to get rid of the leaking wg sockets.
---
drivers/net/wireguard/socket.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c
index 0414d7a6ce74..c35163f503e7 100644
--- a/drivers/net/wireguard/socket.c
+++ b/drivers/net/wireguard/socket.c
@@ -387,7 +387,7 @@ int wg_socket_init(struct wg_device *wg, u16 port)
ret = udp_sock_create(net, &port4, &new4);
if (ret < 0) {
pr_err("%s: Could not create IPv4 socket\n", wg->dev->name);
- goto out;
+ goto err;
}
set_sock_opts(new4);
setup_udp_tunnel_sock(net, new4, &cfg);
@@ -402,7 +402,7 @@ int wg_socket_init(struct wg_device *wg, u16 port)
goto retry;
pr_err("%s: Could not create IPv6 socket\n",
wg->dev->name);
- goto out;
+ goto err;
}
set_sock_opts(new6);
setup_udp_tunnel_sock(net, new6, &cfg);
@@ -414,6 +414,11 @@ int wg_socket_init(struct wg_device *wg, u16 port)
out:
put_net(net);
return ret;
+
+err:
+ sock_free(new4 ? new4->sk : NULL);
+ sock_free(new6 ? new6->sk : NULL);
+ goto out;
}

void wg_socket_reinit(struct wg_device *wg, struct sock *new4,
--
2.39.2