diff options
| author | Andrey V. Elsukov <ae@FreeBSD.org> | 2018-04-13 10:03:30 +0000 |
|---|---|---|
| committer | Andrey V. Elsukov <ae@FreeBSD.org> | 2018-04-13 10:03:30 +0000 |
| commit | 5f69d0a4ffcb954215c930d3e6048f31f8a21cb9 (patch) | |
| tree | 975eb4096102efa2386e5e4d0acba7a870684ae0 /sys/netpfil/ipfw/nat64 | |
| parent | 64966663a81530eed23da91c267e8fbd44ee80af (diff) | |
| download | src-5f69d0a4ffcb954215c930d3e6048f31f8a21cb9.tar.gz src-5f69d0a4ffcb954215c930d3e6048f31f8a21cb9.zip | |
To avoid possible deadlock do not acquire JQUEUE_LOCK before callout_drain.
Obtained from: Yandex LLC
MFC after: 1 week
Sponsored by: Yandex LLC
Notes
Notes:
svn path=/head/; revision=332467
Diffstat (limited to 'sys/netpfil/ipfw/nat64')
| -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 2a4e6970e56b..78a2aa9fff2a 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); |