From b8c431f9c032f1c14ef36e272efeaac6e09f638b Mon Sep 17 00:00:00 2001 From: "Andrey V. Elsukov" Date: Wed, 20 Mar 2019 10:11:21 +0000 Subject: [PATCH] Do not enter epoch section recursively. A pfil hook is already invoked in NET_EPOCH section. --- 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 7def3ed246bc..b1356b3b9696 100644 --- a/sys/netpfil/ipfw/nat64/nat64lsn.c +++ b/sys/netpfil/ipfw/nat64/nat64lsn.c @@ -1514,7 +1514,6 @@ int ipfw_nat64lsn(struct ip_fw_chain *ch, struct ip_fw_args *args, ipfw_insn *cmd, int *done) { - struct epoch_tracker et; struct nat64lsn_cfg *cfg; ipfw_insn *icmd; int ret; @@ -1531,7 +1530,6 @@ ipfw_nat64lsn(struct ip_fw_chain *ch, struct ip_fw_args *args, *done = 1; /* terminate the search */ - NAT64LSN_EPOCH_ENTER(et); switch (args->f_id.addr_type) { case 4: ret = nat64lsn_translate4(cfg, &args->f_id, &args->m); @@ -1551,7 +1549,6 @@ ipfw_nat64lsn(struct ip_fw_chain *ch, struct ip_fw_args *args, default: ret = cfg->nomatch_verdict; } - NAT64LSN_EPOCH_EXIT(et); if (ret != IP_FW_PASS && args->m != NULL) { m_freem(args->m);