aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-04-22 23:32:26 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2020-04-22 23:39:32 -0600
commit34babb386e6a22706ba7d4cdf35a8f112c14e3da (patch)
treea476d5a362adfa8f1fada1370967fc51d82b0bbd
parentcompat: kvmalloc_array is not required anyway (diff)
downloadwireguard-linux-compat-34babb386e6a22706ba7d4cdf35a8f112c14e3da.tar.xz
wireguard-linux-compat-34babb386e6a22706ba7d4cdf35a8f112c14e3da.zip
queueing: cleanup ptr_ring in error path of packet_queue_init
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> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--src/queueing.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/queueing.c b/src/queueing.c
index 5c964fc..71b8e80 100644
--- a/src/queueing.c
+++ b/src/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);
}