svn commit: r332811 - stable/11/sys/netpfil/ipfw/nat64

[Andrey V. Elsukov]

Author: ae
Date: Fri Apr 20 09:54:06 2018
New Revision: 332811
URL: https://svnweb.freebsd.org/changeset/base/332811

Log:
  MFC r332467:
    To avoid possible deadlock do not acquire JQUEUE_LOCK before callout_drain.

Modified:
  stable/11/sys/netpfil/ipfw/nat64/nat64lsn.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netpfil/ipfw/nat64/nat64lsn.c
==============================================================================
--- stable/11/sys/netpfil/ipfw/nat64/nat64lsn.c	Fri Apr 20 09:48:42 2018	(r332810)
+++ stable/11/sys/netpfil/ipfw/nat64/nat64lsn.c	Fri Apr 20 09:54:06 2018	(r332811)
@@ -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);