@@ -48,7 +48,7 @@ static int wg_open(struct net_device *dev)
dev_v6->cnf.addr_gen_mode = IN6_ADDR_GEN_MODE_NONE;
mutex_lock(&wg->device_update_lock);
- ret = wg_socket_init(wg, wg->incoming_port);
+ ret = wg_socket_init(wg, wg->port_cfg);
if (ret < 0)
goto out;
list_for_each_entry(peer, &wg->peer_list, peer_list) {
@@ -249,7 +249,7 @@ static void wg_destruct(struct net_device *dev)
rtnl_unlock();
mutex_lock(&wg->device_update_lock);
rcu_assign_pointer(wg->creating_net, NULL);
- wg->incoming_port = 0;
+ memzero_explicit(&wg->port_cfg, sizeof(wg->port_cfg));
wg_socket_reinit(wg, NULL, NULL);
/* The final references are cleared in the below calls to destroy_workqueue. */
wg_peer_remove_all(wg);
@@ -17,6 +17,7 @@
#include <linux/mutex.h>
#include <linux/net.h>
#include <linux/ptr_ring.h>
+#include <net/udp_tunnel.h>
struct wg_device;
@@ -53,7 +54,7 @@ struct wg_device {
atomic_t handshake_queue_len;
unsigned int num_peers, device_update_gen;
u32 fwmark;
- u16 incoming_port;
+ struct udp_port_cfg port_cfg;
};
int wg_device_init(void);
@@ -26,6 +26,8 @@ static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = {
[WGDEVICE_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN),
[WGDEVICE_A_FLAGS] = { .type = NLA_U32 },
[WGDEVICE_A_LISTEN_PORT] = { .type = NLA_U16 },
+ [WGDEVICE_A_LISTEN_ADDR] = NLA_POLICY_MIN_LEN(sizeof(struct in_addr)),
+ [WGDEVICE_A_LISTEN_IFINDEX] = { .type = NLA_U32 },
[WGDEVICE_A_FWMARK] = { .type = NLA_U32 },
[WGDEVICE_A_PEERS] = { .type = NLA_NESTED }
};
@@ -230,11 +232,22 @@ static int wg_get_device_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (!ctx->next_peer) {
if (nla_put_u16(skb, WGDEVICE_A_LISTEN_PORT,
- wg->incoming_port) ||
+ ntohs(wg->port_cfg.local_udp_port)) ||
+ nla_put_u32(skb, WGDEVICE_A_LISTEN_IFINDEX, wg->port_cfg.bind_ifindex) ||
nla_put_u32(skb, WGDEVICE_A_FWMARK, wg->fwmark) ||
nla_put_u32(skb, WGDEVICE_A_IFINDEX, wg->dev->ifindex) ||
nla_put_string(skb, WGDEVICE_A_IFNAME, wg->dev->name))
goto out;
+ if (wg->port_cfg.family == AF_INET &&
+ nla_put_in_addr(skb, WGDEVICE_A_LISTEN_ADDR,
+ wg->port_cfg.local_ip.s_addr))
+ goto out;
+#if IS_ENABLED(CONFIG_IPV6)
+ if (wg->port_cfg.family == AF_INET6 &&
+ nla_put_in6_addr(skb, WGDEVICE_A_LISTEN_ADDR,
+ &wg->port_cfg.local_ip6))
+ goto out;
+#endif
down_read(&wg->static_identity.lock);
if (wg->static_identity.has_identity) {
@@ -311,19 +324,49 @@ static int wg_get_device_done(struct netlink_callback *cb)
return 0;
}
-static int set_port(struct wg_device *wg, u16 port)
+static int set_port_cfg(struct wg_device *wg, struct nlattr **attrs)
{
struct wg_peer *peer;
+ struct udp_port_cfg port_cfg = {
+ .family = AF_UNSPEC,
+ };
+
+ if (attrs[WGDEVICE_A_LISTEN_PORT])
+ port_cfg.local_udp_port =
+ htons(nla_get_u16(attrs[WGDEVICE_A_LISTEN_PORT]));
+ if (attrs[WGDEVICE_A_LISTEN_ADDR]) {
+ union {
+ struct in_addr addr4;
+ struct in6_addr addr6;
+ } *u_addr = nla_data(attrs[WGDEVICE_A_LISTEN_ADDR]);
+ size_t len = nla_len(attrs[WGDEVICE_A_LISTEN_ADDR]);
+
+ if (len == sizeof(struct in_addr)) {
+ port_cfg.family = AF_INET;
+ port_cfg.local_ip = u_addr->addr4;
+ } else if (len == sizeof(struct in6_addr)) {
+#if IS_ENABLED(CONFIG_IPV6)
+ port_cfg.family = AF_INET6;
+ port_cfg.local_ip6 = u_addr->addr6;
+#else
+ return -EAFNOSUPPORT;
+#endif
+ }
+ }
+ if (attrs[WGDEVICE_A_LISTEN_IFINDEX]) {
+ port_cfg.bind_ifindex =
+ nla_get_u32(attrs[WGDEVICE_A_LISTEN_IFINDEX]);
+ }
- if (wg->incoming_port == port)
+ if (memcmp(&port_cfg, &wg->port_cfg, sizeof(port_cfg)) == 0)
return 0;
list_for_each_entry(peer, &wg->peer_list, peer_list)
wg_socket_clear_peer_endpoint_src(peer);
if (!netif_running(wg->dev)) {
- wg->incoming_port = port;
+ wg->port_cfg = port_cfg;
return 0;
}
- return wg_socket_init(wg, port);
+ return wg_socket_init(wg, port_cfg);
}
static int set_allowedip(struct wg_peer *peer, struct nlattr **attrs)
@@ -531,8 +574,7 @@ static int wg_set_device(struct sk_buff *skb, struct genl_info *info)
}
if (info->attrs[WGDEVICE_A_LISTEN_PORT]) {
- ret = set_port(wg,
- nla_get_u16(info->attrs[WGDEVICE_A_LISTEN_PORT]));
+ ret = set_port_cfg(wg, info->attrs);
if (ret)
goto out;
}
@@ -346,7 +346,7 @@ static void set_sock_opts(struct socket *sock)
sk_set_memalloc(sock->sk);
}
-int wg_socket_init(struct wg_device *wg, u16 port)
+int wg_socket_init(struct wg_device *wg, struct udp_port_cfg port_cfg)
{
struct net *net;
int ret;
@@ -356,12 +356,7 @@ int wg_socket_init(struct wg_device *wg, u16 port)
.encap_rcv = wg_receive
};
struct socket *new4 = NULL, *new6 = NULL;
- struct udp_port_cfg port4 = {
- .family = AF_INET,
- .local_ip.s_addr = htonl(INADDR_ANY),
- .local_udp_port = htons(port),
- .use_udp_checksums = true
- };
+ struct udp_port_cfg port4;
#if IS_ENABLED(CONFIG_IPV6)
int retries = 0;
struct udp_port_cfg port6 = {
@@ -373,6 +368,23 @@ int wg_socket_init(struct wg_device *wg, u16 port)
};
#endif
+ if (port_cfg.family == AF_UNSPEC) {
+ port4 = (struct udp_port_cfg) {
+ .family = AF_INET,
+ .local_ip.s_addr = htonl(INADDR_ANY),
+ .local_udp_port = port_cfg.local_udp_port,
+ .use_udp_checksums = true
+ };
+ } else {
+ port4 = port_cfg;
+ port4.use_udp_checksums = true;
+ if (IS_ENABLED(CONFIG_IPV6) && port_cfg.family == AF_INET6) {
+ port4.use_udp6_tx_checksums = true;
+ port4.use_udp6_rx_checksums = true;
+ port4.ipv6_v6only = true;
+ }
+ }
+
rcu_read_lock();
net = rcu_dereference(wg->creating_net);
net = net ? maybe_get_net(net) : NULL;
@@ -380,10 +392,6 @@ int wg_socket_init(struct wg_device *wg, u16 port)
if (unlikely(!net))
return -ENONET;
-#if IS_ENABLED(CONFIG_IPV6)
-retry:
-#endif
-
ret = udp_sock_create(net, &port4, &new4);
if (ret < 0) {
pr_err("%s: Could not create IPv4 socket\n", wg->dev->name);
@@ -392,13 +400,18 @@ int wg_socket_init(struct wg_device *wg, u16 port)
set_sock_opts(new4);
setup_udp_tunnel_sock(net, new4, &cfg);
+ if (port_cfg.family != AF_UNSPEC)
+ goto reinit;
+
#if IS_ENABLED(CONFIG_IPV6)
+retry:
if (ipv6_mod_enabled()) {
port6.local_udp_port = inet_sk(new4->sk)->inet_sport;
ret = udp_sock_create(net, &port6, &new6);
if (ret < 0) {
udp_tunnel_sock_release(new4);
- if (ret == -EADDRINUSE && !port && retries++ < 100)
+ if (ret == -EADDRINUSE && !port_cfg.local_udp_port &&
+ retries++ < 100)
goto retry;
pr_err("%s: Could not create IPv6 socket\n",
wg->dev->name);
@@ -409,6 +422,8 @@ int wg_socket_init(struct wg_device *wg, u16 port)
}
#endif
+reinit:
+ wg->port_cfg = port_cfg;
wg_socket_reinit(wg, new4->sk, new6 ? new6->sk : NULL);
ret = 0;
out:
@@ -428,8 +443,6 @@ void wg_socket_reinit(struct wg_device *wg, struct sock *new4,
lockdep_is_held(&wg->socket_update_lock));
rcu_assign_pointer(wg->sock4, new4);
rcu_assign_pointer(wg->sock6, new6);
- if (new4)
- wg->incoming_port = ntohs(inet_sk(new4)->inet_sport);
mutex_unlock(&wg->socket_update_lock);
synchronize_net();
sock_free(old4);
@@ -10,8 +10,9 @@
#include <linux/udp.h>
#include <linux/if_vlan.h>
#include <linux/if_ether.h>
+#include <net/udp_tunnel.h>
-int wg_socket_init(struct wg_device *wg, u16 port);
+int wg_socket_init(struct wg_device *wg, struct udp_port_cfg port);
void wg_socket_reinit(struct wg_device *wg, struct sock *new4,
struct sock *new6);
int wg_socket_send_buffer_to_peer(struct wg_peer *peer, void *data,
@@ -28,6 +28,8 @@
* WGDEVICE_A_PRIVATE_KEY: NLA_EXACT_LEN, len WG_KEY_LEN
* WGDEVICE_A_PUBLIC_KEY: NLA_EXACT_LEN, len WG_KEY_LEN
* WGDEVICE_A_LISTEN_PORT: NLA_U16
+ * WGDEVICE_A_LISTEN_ADDR : NLA_MIN_LEN(struct sockaddr), struct sockaddr_in or struct sockaddr_in6
+ * WGDEVICE_A_LISTEN_IFINDEX : NLA_U32
* WGDEVICE_A_FWMARK: NLA_U32
* WGDEVICE_A_PEERS: NLA_NESTED
* 0: NLA_NESTED
@@ -82,6 +84,8 @@
* peers should be removed prior to adding the list below.
* WGDEVICE_A_PRIVATE_KEY: len WG_KEY_LEN, all zeros to remove
* WGDEVICE_A_LISTEN_PORT: NLA_U16, 0 to choose randomly
+ * WGDEVICE_A_LISTEN_ADDR : struct sockaddr_in or struct sockaddr_in6.
+ * WGDEVICE_A_LISTEN_IFINDEX : NLA_U32
* WGDEVICE_A_FWMARK: NLA_U32, 0 to disable
* WGDEVICE_A_PEERS: NLA_NESTED
* 0: NLA_NESTED
@@ -157,6 +161,8 @@ enum wgdevice_attribute {
WGDEVICE_A_LISTEN_PORT,
WGDEVICE_A_FWMARK,
WGDEVICE_A_PEERS,
+ WGDEVICE_A_LISTEN_ADDR,
+ WGDEVICE_A_LISTEN_IFINDEX,
__WGDEVICE_A_LAST
};
#define WGDEVICE_A_MAX (__WGDEVICE_A_LAST - 1)
Currently wg sockets are always bound to the wildcard address, this has two major downsides we care about: 1) It prevents re-using listen one port numbers on different ifaces/IPs. Our use case lies in dynamically routed wg mesh networks. Here running one wg tunnel with AllowedIPs=::/0[1] per node *pair* is not unusual, but needing unique ports across the whole network actually represents a tangible scalability concern because as few as n=363 nodes will cause port exhaustion since n*(n-1)/2 > 2^16-1. [1]: The need to do that comes from the lack of routing daemon support for dynamically managing AllowedIPs which in turn is due to poor scalability of the current netlink interface. 2) It has been demonstrated that having tunnel underlay and overlay routes mixed into one routing table is fraught with peril[2] so it is desirable to allow wireguard sockets to bind to a VRF l3mdev to separate the two. Technically ip-rules hacks could be applied to make this happen but since routing table separation is a serious security concern we should make doing it right easy. [2]: Xue et. al. Bypassing Tunnels: Leaking VPN Client Traffic by Abusing Routing Tables. https://www.usenix.org/conference/usenixsecurity23/presentation/xue The implementation is intentionally backwards compatible. Older wireguard-tools userspace will only show WGDEVICE_A_LISTEN_PORT even when we're listening on an IP or netdev and omitting the new listen attrs during set results in a wildcard bound socket as ever. Signed-off-by: Daniel Gröber <dxld@darkboxed.org> --- Changes in v3: - Rewrite commit message Userspace wireguard-tools patches are here: https://lists.zx2c4.com/pipermail/wireguard/2023-October/thread.html#8222 wg: Support binding to specific addr and iface for multihomed hosts drivers/net/wireguard/device.c | 4 +-- drivers/net/wireguard/device.h | 3 +- drivers/net/wireguard/netlink.c | 56 ++++++++++++++++++++++++++++----- drivers/net/wireguard/socket.c | 41 +++++++++++++++--------- drivers/net/wireguard/socket.h | 3 +- include/uapi/linux/wireguard.h | 6 ++++ 6 files changed, 88 insertions(+), 25 deletions(-)