Feb 25, 2020

patches/344061.patch

@@ -0,0 +1,20 @@
+--- sys/netinet/if_ether.c	2019/02/12 21:08:44	344060
++++ sys/netinet/if_ether.c	2019/02/12 21:22:57	344061
+@@ -1335,6 +1335,8 @@
+ 		return;
+ 	}
+ 
++	CURVNET_SET(ia->ia_ifa.ifa_ifp->if_vnet);
++
+ 	/*
+ 	 * Drop lock while the ARP request is generated.
+ 	 */
+@@ -1362,6 +1364,8 @@
+ 			ifa_free(&ia->ia_ifa);
+ 		}
+ 	}
++
++	CURVNET_RESTORE();
+ }
+ 
+ /*

patches/344356.patch

@@ -0,0 +1,18 @@
+--- sys/netinet/in_pcb.c	2019/02/20 10:03:03	344355
++++ sys/netinet/in_pcb.c	2019/02/20 10:22:48	344356
+@@ -1566,6 +1566,7 @@
+ 	inp = __containerof(ctx, struct inpcb, inp_epoch_ctx);
+ 
+ 	INP_WLOCK(inp);
++	CURVNET_SET(inp->inp_vnet);
+ #ifdef INET
+ 	struct ip_moptions *imo = inp->inp_moptions;
+ 	inp->inp_moptions = NULL;
+@@ -1598,6 +1599,7 @@
+ #ifdef INET
+ 	inp_freemoptions(imo);
+ #endif	
++	CURVNET_RESTORE();
+ }
+ 
+ /*

patches/D20868.patch

@@ -0,0 +1,17 @@
+Index: sys/net/if_epair.c
+===================================================================
+--- sys/net/if_epair.c
++++ sys/net/if_epair.c
+@@ -609,8 +609,10 @@
+ 	struct epair_softc *sc;
+ 	
+ 	sc = ifp->if_softc;
+-	KASSERT(sc != NULL, ("%s: ifp=%p, epair_softc gone? sc=%p\n",
+-	    __func__, ifp, sc));
++
++	if (sc == NULL)
++		return;
++
+ 	/*
+ 	 * Remove this ifp from all backpointer lists. The interface will not
+ 	 * usable for flushing anyway nor should it have anything to flush

patches/D20869.patch

@@ -0,0 +1,15 @@
+Index: sys/net/if.c
+===================================================================
+--- sys/net/if.c
++++ sys/net/if.c
+@@ -1309,6 +1309,10 @@
+ 	if (ifp->if_reassign != NULL)
+ 		ifp->if_reassign(ifp, new_vnet, NULL);
+ 
++	/* Don't re-attach DYING interfaces. */
++	if (ifp->if_flags & IFF_DYING)
++		return;
++
+ 	/*
+ 	 * Switch to the context of the target vnet.
+ 	 */