summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-04-29 14:59:21 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2022-07-07 13:26:42 +0200
commit0610e4ebece429700d4a48efd71c0fa6172547f1 (patch)
tree4c8af88e050795faf1510ad895fef30d279b346e
parentd1a2245a9f1c1aa90976a7d6e3996757707fdffb (diff)
downloadwireguard-linux-trimmed-0610e4ebece429700d4a48efd71c0fa6172547f1.tar.gz
wireguard-linux-trimmed-0610e4ebece429700d4a48efd71c0fa6172547f1.zip
wireguard: queueing: cleanup ptr_ring in error path of packet_queue_init
commit c21baa8fd865c29b17d814ba22220e3c0e08632c 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: a8f1bc7bdea3 ("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>
-rw-r--r--drivers/net/wireguard/queueing.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireguard/queueing.c b/drivers/net/wireguard/queueing.c
index 5c964fc..71b8e80 100644
--- a/drivers/net/wireguard/queueing.c
+++ b/drivers/net/wireguard/queueing.c
@@ -35,8 +35,10 @@ int wg_packet_queue_init(struct crypt_queue *queue, work_func_t function,
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);
}