Page MenuHomeFreeBSD
Files F146538394

D40708.id123686.diff
No OneTemporary
Actions

D40708.id123686.diff
View Options

diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c
--- a/sys/dev/wg/if_wg.c
+++ b/sys/dev/wg/if_wg.c
@@ -2984,39 +2984,27 @@
static int
wg_module_init(void)
{
- int ret = ENOMEM;
-
+ int ret;
osd_method_t methods[PR_MAXMETHOD] = {
[PR_METHOD_REMOVE] = wg_prison_remove,
};
if ((wg_packet_zone = uma_zcreate("wg packet", sizeof(struct wg_packet),
NULL, NULL, NULL, NULL, 0, 0)) == NULL)
- goto free_none;
+ return (ENOMEM);
ret = crypto_init();
if (ret != 0)
- goto free_zone;
+ return (ret);
ret = cookie_init();
if (ret != 0)
- goto free_crypto;
+ return (ret);
wg_osd_jail_slot = osd_jail_register(NULL, methods);
- ret = ENOTRECOVERABLE;
if (!wg_run_selftests())
- goto free_all;
+ return (ENOTRECOVERABLE);
return (0);
-
-free_all:
- osd_jail_deregister(wg_osd_jail_slot);
- cookie_deinit();
-free_crypto:
- crypto_deinit();
-free_zone:
- uma_zdestroy(wg_packet_zone);
-free_none:
- return (ret);
}
static void
@@ -3034,10 +3022,12 @@
VNET_LIST_RUNLOCK();
NET_EPOCH_WAIT();
MPASS(LIST_EMPTY(&wg_list));
- osd_jail_deregister(wg_osd_jail_slot);
+ if (wg_osd_jail_slot != 0)
+ osd_jail_deregister(wg_osd_jail_slot);
cookie_deinit();
crypto_deinit();
- uma_zdestroy(wg_packet_zone);
+ if (wg_packet_zone != NULL)
+ uma_zdestroy(wg_packet_zone);
}
static int
diff --git a/sys/dev/wg/wg_cookie.c b/sys/dev/wg/wg_cookie.c
--- a/sys/dev/wg/wg_cookie.c
+++ b/sys/dev/wg/wg_cookie.c
@@ -55,6 +55,7 @@
struct callout rl_gc;
LIST_HEAD(, ratelimit_entry) rl_table[RATELIMIT_SIZE];
size_t rl_table_num;
+ bool rl_initialized;
};
static void precompute_key(uint8_t *,
@@ -102,7 +103,8 @@
#ifdef INET6
ratelimit_deinit(&ratelimit_v6);
#endif
- uma_zdestroy(ratelimit_zone);
+ if (ratelimit_zone != NULL)
+ uma_zdestroy(ratelimit_zone);
}
void
@@ -350,16 +352,21 @@
for (i = 0; i < RATELIMIT_SIZE; i++)
LIST_INIT(&rl->rl_table[i]);
rl->rl_table_num = 0;
+ rl->rl_initialized = true;
}
static void
ratelimit_deinit(struct ratelimit *rl)
{
+ if (!rl->rl_initialized)
+ return;
mtx_lock(&rl->rl_mtx);
callout_stop(&rl->rl_gc);
ratelimit_gc(rl, true);
mtx_unlock(&rl->rl_mtx);
mtx_destroy(&rl->rl_mtx);
+
+ rl->rl_initialized = false;
}
static void

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 4, 11:53 AM (6 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29241531
Default Alt Text
D40708.id123686.diff (2 KB)

Event Timeline