From 8eaaab0234e472600df80d22ef3b9d2995eb3879 Mon Sep 17 00:00:00 2001 From: ae Date: Fri, 20 Apr 2018 09:54:06 +0000 Subject: MFC r332467: To avoid possible deadlock do not acquire JQUEUE_LOCK before callout_drain. --- sys/netpfil/ipfw/nat64/nat64lsn.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netpfil/ipfw/nat64/nat64lsn.c b/sys/netpfil/ipfw/nat64/nat64lsn.c index 2a4e697..78a2aa9 100644 --- a/sys/netpfil/ipfw/nat64/nat64lsn.c +++ b/sys/netpfil/ipfw/nat64/nat64lsn.c @@ -1755,10 +1755,7 @@ nat64lsn_destroy_instance(struct nat64lsn_cfg *cfg) { struct nat64lsn_host *nh, *tmp; - JQUEUE_LOCK(); callout_drain(&cfg->jcallout); - JQUEUE_UNLOCK(); - callout_drain(&cfg->periodic); I6HASH_FOREACH_SAFE(cfg, nh, tmp, nat64lsn_destroy_host, cfg); DPRINTF(DP_OBJ, "instance %s: hosts %d", cfg->name, cfg->ihcount); -- cgit v1.1