diff options
| author | Kristof Provost <kp@FreeBSD.org> | 2021-07-20 19:03:08 +0000 |
|---|---|---|
| committer | Kristof Provost <kp@FreeBSD.org> | 2021-07-27 07:45:41 +0000 |
| commit | 7d226e964ab78c704c9eec40daa95a4c6ab1b323 (patch) | |
| tree | f79ea2d6b2f375acaf5a1b6fa145657f2d272ec1 | |
| parent | 00b005036b51631f71cb8ca40aa2d6723e623bef (diff) | |
pf: clean up syncookie callout on vnet shutdown
Ensure that we cancel any outstanding callouts for syncookies when we
terminate the vnet.
MFC after: 1 week
Sponsored by: Modirum MDPay
(cherry picked from commit 32271c4d383effeac7878201ef5cbdfaeedc3755)
| -rw-r--r-- | sys/net/pfvar.h | 1 | ||||
| -rw-r--r-- | sys/netpfil/pf/pf_ioctl.c | 1 | ||||
| -rw-r--r-- | sys/netpfil/pf/pf_syncookies.c | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index b4a788436147..e54e734dcecf 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1841,6 +1841,7 @@ void pf_send_tcp(const struct pf_krule *, sa_family_t, u_int16_t); void pf_syncookies_init(void); +void pf_syncookies_cleanup(void); int pf_get_syncookies(struct pfioc_nv *); int pf_set_syncookies(struct pfioc_nv *); int pf_synflood_check(struct pf_pdesc *); diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 96eb31b00ffb..6af5197ef07d 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5574,6 +5574,7 @@ pf_unload_vnet(void) dehook_pf(); PF_RULES_WLOCK(); + pf_syncookies_cleanup(); shutdown_pf(); PF_RULES_WUNLOCK(); diff --git a/sys/netpfil/pf/pf_syncookies.c b/sys/netpfil/pf/pf_syncookies.c index 0313b817ad6d..8699ae855ec8 100644 --- a/sys/netpfil/pf/pf_syncookies.c +++ b/sys/netpfil/pf/pf_syncookies.c @@ -127,6 +127,12 @@ pf_syncookies_init(void) PF_RULES_WUNLOCK(); } +void +pf_syncookies_cleanup(void) +{ + callout_stop(&V_pf_syncookie_status.keytimeout); +} + int pf_get_syncookies(struct pfioc_nv *nv) { |