From: "Daniel Gröber" <dxld@darkboxed.org>
To: wireguard@lists.zx2c4.com
Cc: "Daniel Gröber" <dxld@darkboxed.org>
Subject: [PATCH] wireguard: Fix leaking sockets in wg_socket_init error paths
Date: Thu, 17 Aug 2023 22:02:02 +0200 [thread overview]
Message-ID: <20230817200202.917382-1-dxld@darkboxed.org> (raw)
---
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
next reply other threads:[~2023-08-17 20:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-17 20:02 Daniel Gröber [this message]
2023-10-23 13:06 Daniel Gröber
2023-10-23 14:04 ` Jason A. Donenfeld
2023-10-23 15:59 ` Daniel Gröber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230817200202.917382-1-dxld@darkboxed.org \
--to=dxld@darkboxed.org \
--cc=wireguard@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).