git: fbef5f8f7e85 - stable/12 - pf: clean up syncookie callout on vnet shutdown
Kristof Provost
kp at FreeBSD.org
Tue Jul 27 11:46:56 UTC 2021
The branch stable/12 has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=fbef5f8f7e8506890c81a7a1c72cab587e9205e7
commit fbef5f8f7e8506890c81a7a1c72cab587e9205e7
Author: Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-07-20 19:03:08 +0000
Commit: Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-07-27 11:24:27 +0000
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)
---
sys/net/pfvar.h | 1 +
sys/netpfil/pf/pf_ioctl.c | 1 +
sys/netpfil/pf/pf_syncookies.c | 6 ++++++
3 files changed, 8 insertions(+)
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index d072eedd3621..7d31e4ce21a0 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1842,6 +1842,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 dde2aecc8ef5..a3026d394bde 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -5633,6 +5633,7 @@ pf_unload_vnet(void)
}
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 43d3a0a0b036..bfcc4b3d4e82 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)
{
More information about the dev-commits-src-all
mailing list