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: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
|
|
|
Date: Wed, 29 Apr 2020 14:59:21 -0600
|
2021-03-02 08:24:45 +00:00
|
|
|
Subject: [PATCH] wireguard: queueing: cleanup ptr_ring in error path of
|
|
|
|
|
packet_queue_init
|
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 130c58606171326c81841a49cc913cd354113dd9 upstream.
|
|
|
|
|
|
|
|
|
|
Prior, if the alloc_percpu of packet_percpu_multicore_worker_alloc
|
|
|
|
|
failed, the previously allocated ptr_ring wouldn't be freed. This commit
|
|
|
|
|
adds the missing call to ptr_ring_cleanup in the error case.
|
|
|
|
|
|
|
|
|
|
Reported-by: Sultan Alsawaf <sultan@kerneltoast.com>
|
|
|
|
|
Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
|
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
|
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/net/wireguard/queueing.c | 4 +++-
|
|
|
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/wireguard/queueing.c
|
|
|
|
|
+++ b/drivers/net/wireguard/queueing.c
|
|
|
|
|
@@ -35,8 +35,10 @@ int wg_packet_queue_init(struct crypt_qu
|
|
|
|
|
if (multicore) {
|
|
|
|
|
queue->worker = wg_packet_percpu_multicore_worker_alloc(
|
|
|
|
|
function, queue);
|
|
|
|
|
- if (!queue->worker)
|
|
|
|
|
+ if (!queue->worker) {
|
|
|
|
|
+ ptr_ring_cleanup(&queue->ring, NULL);
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
+ }
|
|
|
|
|
} else {
|
|
|
|
|
INIT_WORK(&queue->work, function);
|
|
|
|
|
}
|
