diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-03-30 19:14:11 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-30 19:14:12 -0700 |
| commit | 7623627b41ca77b0e1031465774b143db1c3331b (patch) | |
| tree | 5e36a557dc4cecd3a1926c7c8718905104f2a26d /drivers/net/wireguard/queueing.c | |
| parent | 0c854e53be0cb97653f9bba38a65d3c7221f7a83 (diff) | |
| parent | 39229b62273de0d2cd316e7625cd1f82512345e7 (diff) | |
| download | wireguard-linux-trimmed-7623627b41ca77b0e1031465774b143db1c3331b.tar.gz wireguard-linux-trimmed-7623627b41ca77b0e1031465774b143db1c3331b.zip | |
Merge branch 'wireguard-patches-for-5-18-rc1'
Jason A. Donenfeld says:
====================
wireguard patches for 5.18-rc1
Here's a small set of fixes for the next net push:
1) Pipacs reported a CFI violation in a cleanup routine, which he
triggered using grsec's RAP. I haven't seen reports of this yet from
the Android/CFI world yet, but it's only a matter of time there.
2) A small rng cleanup to the self test harness to make it initialize
faster on 5.18.
3) Wang reported and fixed a skb leak for CONFIG_IPV6=n.
4) After Wang's fix for the direct leak, I investigated how that code
path even could be hit, and found that the netlink layer still
handles IPv6 endpoints, when it probably shouldn't.
====================
Link: https://lore.kernel.org/r/20220330013127.426620-1-Jason@zx2c4.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/wireguard/queueing.c')
| -rw-r--r-- | drivers/net/wireguard/queueing.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireguard/queueing.c b/drivers/net/wireguard/queueing.c index 1de413b..8084e74 100644 --- a/drivers/net/wireguard/queueing.c +++ b/drivers/net/wireguard/queueing.c @@ -4,6 +4,7 @@ */ #include "queueing.h" +#include <linux/skb_array.h> struct multicore_worker __percpu * wg_packet_percpu_multicore_worker_alloc(work_func_t function, void *ptr) @@ -42,7 +43,7 @@ void wg_packet_queue_free(struct crypt_queue *queue, bool purge) { free_percpu(queue->worker); WARN_ON(!purge && !__ptr_ring_empty(&queue->ring)); - ptr_ring_cleanup(&queue->ring, purge ? (void(*)(void*))kfree_skb : NULL); + ptr_ring_cleanup(&queue->ring, purge ? __skb_array_destroy_skb : NULL); } #define NEXT(skb) ((skb)->prev) |