Remove softc from idhash when interface is destroyed.

MFC after:	20 days

This commit is contained in:

Andrey V. Elsukov

2018-10-23 12:50:28 +00:00

parent 2a7db7a63d

commit e6b383b2f5

1 changed files with 7 additions and 3 deletions

									
										sys/net/if_ipsec.c
									
		+7
		-3
	
												View File
												
				@@ -214,6 +214,12 @@ ipsec_clone_destroy(struct ifnet *ifp)

					sx_xlock(&ipsec_ioctl_sx);

					sc = ifp->if_softc;

					ipsec_delete_tunnel(sc);

					/*

					 * Delete softc from idhash on interface destroy, since

					 * ipsec_delete_tunnel() keeps reqid unchanged.

					 */

					if (sc->reqid != 0)

						CK_LIST_REMOVE(sc, idhash);

					bpfdetach(ifp);

					if_detach(ifp);

					ifp->if_softc = NULL;

				@@ -1025,13 +1031,11 @@ ipsec_delete_tunnel(struct ipsec_softc *sc)

					sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING;

					if (sc->family != 0) {

						CK_LIST_REMOVE(sc, srchash);

						IPSEC_WAIT();

						sc->family = 0;

						/*

						 * Make sure that ipsec_if_input() will not do access

						 * to softc's policies.

						 */

						sc->family = 0;

						IPSEC_WAIT();

						key_unregister_ifnet(sc->sp, IPSEC_SPCOUNT);