diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2022-03-02 23:48:40 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-03-02 23:49:51 +0100 |
| commit | 4eff63d292f714a67834bfbd7cbc4c0fa0b1dd52 (patch) | |
| tree | 9cc99808a98466f0e428c764dd13285b39a8d631 /src/queueing.c | |
| parent | crypto: curve25519-x86_64: use in/out register constraints more precisely (diff) | |
| download | wireguard-linux-compat-4eff63d292f714a67834bfbd7cbc4c0fa0b1dd52.tar.xz wireguard-linux-compat-4eff63d292f714a67834bfbd7cbc4c0fa0b1dd52.zip | |
queueing: use CFI-safe ptr_ring cleanup function
We make too nuanced use of ptr_ring to entirely move to the skb_array
wrappers, but we at least should avoid the naughty function pointer cast
when cleaning up skbs. Otherwise RAP/CFI will honk at us. This patch
uses the __skb_array_destroy_skb wrapper for the cleanup, rather than
directly providing kfree_skb, which is what other drivers in the same
situation do too.
Reported-by: PaX Team <pageexec@freemail.hu>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
| -rw-r--r-- | src/queueing.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/queueing.c b/src/queueing.c index 1de413b..8084e74 100644 --- a/src/queueing.c +++ b/src/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) |