Date: Tue, 23 Oct 2018 13:03:03 +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: r339646 - head/sys/net Message-ID: <201810231303.w9ND33C1016372@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Tue Oct 23 13:03:03 2018 New Revision: 339646 URL: https://svnweb.freebsd.org/changeset/base/339646 Log: Add the check that current VNET is ready and access to srchash is allowed. ipsec_srcaddr() callback can be called during VNET teardown, since ingress address checking subsystem isn't VNET specific. And thus callback can make access to already freed memory. To prevent this, use V_ipsec_idhtbl pointer as indicator of VNET readiness. And make epoch_wait() after resetting it to NULL in vnet_ipsec_uninit() to be sure that ipsec_srcaddr() is finished its work. Reported by: kp MFC after: 20 days Modified: head/sys/net/if_ipsec.c Modified: head/sys/net/if_ipsec.c ============================================================================== --- head/sys/net/if_ipsec.c Tue Oct 23 13:00:11 2018 (r339645) +++ head/sys/net/if_ipsec.c Tue Oct 23 13:03:03 2018 (r339646) @@ -273,6 +273,13 @@ vnet_ipsec_uninit(const void *unused __unused) if_clone_detach(V_ipsec_cloner); free(V_ipsec_idhtbl, M_IPSEC); + /* + * Use V_ipsec_idhtbl pointer as indicator that VNET is going to be + * destroyed, it is used by ipsec_srcaddr() callback. + */ + V_ipsec_idhtbl = NULL; + IPSEC_WAIT(); + #ifdef INET if (IS_DEFAULT_VNET(curvnet)) ip_encap_unregister_srcaddr(ipsec4_srctab); @@ -784,6 +791,10 @@ ipsec_srcaddr(void *arg __unused, const struct sockadd { struct ipsec_softc *sc; struct secasindex *saidx; + + /* Check that VNET is ready */ + if (V_ipsec_idhtbl == NULL) + return; MPASS(in_epoch(net_epoch_preempt)); CK_LIST_FOREACH(sc, ipsec_srchash(sa), srchash) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810231303.w9ND33C1016372>