From 1a097249c55f4dbede0e7a256d3c473c7effbade Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 17 Nov 2017 11:48:18 +0100 Subject: device: uninitialize socket first in destruction Signed-off-by: Jason A. Donenfeld --- src/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/device.c b/src/device.c index 12c11fb..1b3ab4f 100644 --- a/src/device.c +++ b/src/device.c @@ -208,8 +208,9 @@ static void destruct(struct net_device *dev) list_del(&wg->device_list); rtnl_unlock(); mutex_lock(&wg->device_update_lock); - peer_remove_all(wg); /* The final references are cleared in the below calls to destroy_workqueue. */ wg->incoming_port = 0; + socket_reinit(wg, NULL, NULL); + peer_remove_all(wg); /* The final references are cleared in the below calls to destroy_workqueue. */ destroy_workqueue(wg->handshake_receive_wq); destroy_workqueue(wg->handshake_send_wq); packet_queue_free(&wg->decrypt_queue, true); @@ -220,7 +221,6 @@ static void destruct(struct net_device *dev) ratelimiter_uninit(); memzero_explicit(&wg->static_identity, sizeof(struct noise_static_identity)); skb_queue_purge(&wg->incoming_handshakes); - socket_reinit(wg, NULL, NULL); free_percpu(dev->tstats); free_percpu(wg->incoming_handshakes_worker); if (wg->have_creating_net_ref) -- cgit v1.2.3