diff options
author | kp <kp@FreeBSD.org> | 2017-07-20 17:15:18 +0000 |
---|---|---|
committer | kp <kp@FreeBSD.org> | 2017-07-20 17:15:18 +0000 |
commit | 6fa35bfa45a3084d642114b455d58596c73d9962 (patch) | |
tree | 5f28c3d312faa2e340c4d78c197fb34935206b14 | |
parent | 84e27c02a79aac4982b979baf4580de3e927c63e (diff) | |
download | FreeBSD-src-6fa35bfa45a3084d642114b455d58596c73d9962.zip FreeBSD-src-6fa35bfa45a3084d642114b455d58596c73d9962.tar.gz |
MFC r312943
Do not run the pf purge thread while the VNET variables are not
initialized, this can cause a divide by zero (if the VNET initialization
takes to long to complete).
PR: 220830
-rw-r--r-- | sys/netpfil/pf/pf.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8dc89a8..1fa0b7a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -129,6 +129,8 @@ VNET_DEFINE(int, pf_tcp_secret_init); #define V_pf_tcp_secret_init VNET(pf_tcp_secret_init) VNET_DEFINE(int, pf_tcp_iss_off); #define V_pf_tcp_iss_off VNET(pf_tcp_iss_off) +VNET_DECLARE(int, pf_vnet_active); +#define V_pf_vnet_active VNET(pf_vnet_active) /* * Queue for pf_intr() sends. @@ -1441,6 +1443,12 @@ pf_purge_thread(void *unused __unused) kproc_exit(0); } + /* Wait while V_pf_default_rule.timeout is initialized. */ + if (V_pf_vnet_active == 0) { + CURVNET_RESTORE(); + continue; + } + /* Process 1/interval fraction of the state table every run. */ idx = pf_purge_expired_states(idx, pf_hashmask / (V_pf_default_rule.timeout[PFTM_INTERVAL] * 10)); |