diff options
| author | ae <ae@FreeBSD.org> | 2018-04-20 09:54:06 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2018-04-20 09:54:06 +0000 |
| commit | 8eaaab0234e472600df80d22ef3b9d2995eb3879 (patch) | |
| tree | a016d8a067c2a62eb0aa656f1bcaa1a06db32526 | |
| parent | 3d8e00bd517402ed6ffeff1251abc527f1265bf1 (diff) | |
| download | FreeBSD-src-8eaaab0234e472600df80d22ef3b9d2995eb3879.zip FreeBSD-src-8eaaab0234e472600df80d22ef3b9d2995eb3879.tar.gz | |
MFC r332467:
To avoid possible deadlock do not acquire JQUEUE_LOCK before callout_drain.
| -rw-r--r-- | sys/netpfil/ipfw/nat64/nat64lsn.c | 3 |
1 files changed, 0 insertions, 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); |
