Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94582992 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Lee Jones
Browse files

UPSTREAM: wireguard: 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.

Bug: 254441685
Reported-by: default avatarPaX Team <pageexec@freemail.hu>
Fixes: 886fcee939ad ("wireguard: receive: use ring buffer for incoming handshakes")
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
(cherry picked from commit ec59f128a9bd4255798abb1e06ac3b442f46ef68)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I049ef81fa1ff7a062d95094f879cdc9917129581
parent f1e53268

drivers/net/wireguard/queueing.c

+2 −1
Original line number Diff line number Diff line
@@ -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)