2021-03-02 08:24:45 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
kernel: 5.4: import wireguard backport
Rather than using the clunky, old, slower wireguard-linux-compat out of
tree module, this commit does a patch-by-patch backport of upstream's
wireguard to 5.4. This specific backport is in widespread use, being
part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's
Android kernel, Gentoo's distro kernel, and probably more I've forgotten
about. It's definately the "more proper" way of adding wireguard to a
kernel than the ugly compat.h hell of the wireguard-linux-compat repo.
And most importantly for OpenWRT, it allows using the same module
configuration code for 5.10 as for 5.4, with no need for bifurcation.
These patches are from the backport tree which is maintained in the
open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
I'll be sending PRs to update this as needed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2021-02-19 13:29:04 +00:00
|
|
|
From: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
Date: Tue, 18 Aug 2020 10:17:31 +0200
|
2021-03-02 08:24:45 +00:00
|
|
|
Subject: [PATCH] netlink: consistently use NLA_POLICY_EXACT_LEN()
|
kernel: 5.4: import wireguard backport
Rather than using the clunky, old, slower wireguard-linux-compat out of
tree module, this commit does a patch-by-patch backport of upstream's
wireguard to 5.4. This specific backport is in widespread use, being
part of SUSE's enterprise kernel, Oracle's enterprise kernel, Google's
Android kernel, Gentoo's distro kernel, and probably more I've forgotten
about. It's definately the "more proper" way of adding wireguard to a
kernel than the ugly compat.h hell of the wireguard-linux-compat repo.
And most importantly for OpenWRT, it allows using the same module
configuration code for 5.10 as for 5.4, with no need for bifurcation.
These patches are from the backport tree which is maintained in the
open here: https://git.zx2c4.com/wireguard-linux/log/?h=backport-5.4.y
I'll be sending PRs to update this as needed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2021-02-19 13:29:04 +00:00
|
|
|
|
|
|
|
|
commit 8140860c817f3e9f78bcd1e420b9777ddcbaa629 upstream.
|
|
|
|
|
|
|
|
|
|
Change places that open-code NLA_POLICY_EXACT_LEN() to
|
|
|
|
|
use the macro instead, giving us flexibility in how we
|
|
|
|
|
handle the details of the macro.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
|
Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
|
|
|
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
|
[Jason: only picked the drivers/net/wireguard/* part]
|
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/net/wireguard/netlink.c | 10 +++++-----
|
|
|
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/wireguard/netlink.c
|
|
|
|
|
+++ b/drivers/net/wireguard/netlink.c
|
|
|
|
|
@@ -22,8 +22,8 @@ static struct genl_family genl_family;
|
|
|
|
|
static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = {
|
|
|
|
|
[WGDEVICE_A_IFINDEX] = { .type = NLA_U32 },
|
|
|
|
|
[WGDEVICE_A_IFNAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
|
|
|
|
|
- [WGDEVICE_A_PRIVATE_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_PUBLIC_KEY_LEN },
|
|
|
|
|
- [WGDEVICE_A_PUBLIC_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_PUBLIC_KEY_LEN },
|
|
|
|
|
+ [WGDEVICE_A_PRIVATE_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN),
|
|
|
|
|
+ [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_FWMARK] = { .type = NLA_U32 },
|
|
|
|
|
@@ -31,12 +31,12 @@ static const struct nla_policy device_po
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = {
|
|
|
|
|
- [WGPEER_A_PUBLIC_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_PUBLIC_KEY_LEN },
|
|
|
|
|
- [WGPEER_A_PRESHARED_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_SYMMETRIC_KEY_LEN },
|
|
|
|
|
+ [WGPEER_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN),
|
|
|
|
|
+ [WGPEER_A_PRESHARED_KEY] = NLA_POLICY_EXACT_LEN(NOISE_SYMMETRIC_KEY_LEN),
|
|
|
|
|
[WGPEER_A_FLAGS] = { .type = NLA_U32 },
|
|
|
|
|
[WGPEER_A_ENDPOINT] = { .type = NLA_MIN_LEN, .len = sizeof(struct sockaddr) },
|
|
|
|
|
[WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL] = { .type = NLA_U16 },
|
|
|
|
|
- [WGPEER_A_LAST_HANDSHAKE_TIME] = { .type = NLA_EXACT_LEN, .len = sizeof(struct __kernel_timespec) },
|
|
|
|
|
+ [WGPEER_A_LAST_HANDSHAKE_TIME] = NLA_POLICY_EXACT_LEN(sizeof(struct __kernel_timespec)),
|
|
|
|
|
[WGPEER_A_RX_BYTES] = { .type = NLA_U64 },
|
|
|
|
|
[WGPEER_A_TX_BYTES] = { .type = NLA_U64 },
|
|
|
|
|
[WGPEER_A_ALLOWEDIPS] = { .type = NLA_NESTED },
|
