Date: Fri, 13 Apr 2018 10:03:30 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332467 - head/sys/netpfil/ipfw/nat64 Message-ID: <201804131003.w3DA3ULq040394@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Fri Apr 13 10:03:30 2018 New Revision: 332467 URL: https://svnweb.freebsd.org/changeset/base/332467 Log: To avoid possible deadlock do not acquire JQUEUE_LOCK before callout_drain. Obtained from: Yandex LLC MFC after: 1 week Sponsored by: Yandex LLC Modified: head/sys/netpfil/ipfw/nat64/nat64lsn.c Modified: head/sys/netpfil/ipfw/nat64/nat64lsn.c ============================================================================== --- head/sys/netpfil/ipfw/nat64/nat64lsn.c Fri Apr 13 09:04:31 2018 (r332466) +++ head/sys/netpfil/ipfw/nat64/nat64lsn.c Fri Apr 13 10:03:30 2018 (r332467) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804131003.w3DA3ULq040394>