In preparation for fixing races in ARP (and probably in other

L2/L3 mappings) make rt_check() return a locked rtentry.

6 files changed, 9 insertions, 3 deletions

diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index 07df91c..fa8778d 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -158,6 +158,7 @@ atm_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
 			error = rt_check(&rt, &rt0, dst);
 			if (error)
 				goto bad;
+			RT_UNLOCK(rt);
 
 			if (dst->sa_family == AF_INET6)
 			        etype = ETHERTYPE_IPV6;
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index b3884b5..baff6ec 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -105,6 +105,7 @@ firewire_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 	error = rt_check(&rt, &rt0, dst);
 	if (error)
 		goto bad;
+	RT_UNLOCK(rt);
 
 	/*
 	 * For unicast, we make a tag to store the lladdr of the
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index fd04bc1..6c30564 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -262,6 +262,7 @@ iso88025_output(ifp, m, dst, rt0)
 	error = rt_check(&rt, &rt0, dst);
 	if (error)
 		goto bad;
+	RT_UNLOCK(rt);
 
 	if (rt && (sdl = (struct sockaddr_dl *)rt->rt_gateway))
 		if (SDL_ISO88025(sdl)->trld_rcf != 0)
diff --git a/sys/net/route.c b/sys/net/route.c
index 1cb1c1c..51b2631 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1302,11 +1302,12 @@ rt_check(struct rtentry **lrt, struct rtentry **lrt0, struct sockaddr *dst)
 		error = (rt->rt_flags & RTF_REJECT) &&
 			(rt->rt_rmx.rmx_expire == 0 ||
 				time_second < rt->rt_rmx.rmx_expire);
-		RT_UNLOCK(rt);
-		if (error)
+		if (error) {
+			RT_UNLOCK(rt);
 			senderr(rt == rt0 ? EHOSTDOWN : EHOSTUNREACH);
+		}
 	}
-	*lrt = rt;		/* NB: return unlocked */
+	*lrt = rt;
 	*lrt0 = rt0;
 	return (0);
 bad:
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 83e5449..ed325d7 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -376,6 +376,7 @@ arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m,
 		m_freem(m);
 		return error;
 	}
+	RT_UNLOCK(rt);
 
 	if (m->m_flags & M_BCAST) {	/* broadcast */
 		(void)memcpy(desten, ifp->if_broadcastaddr, ifp->if_addrlen);
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 76efccf..2c4cc53 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -2070,6 +2070,7 @@ nd6_storelladdr(ifp, rt0, m, dst, desten)
 		m_freem(m);
 		return (error);
 	}
+	RT_UNLOCK(rt);
 
 	if (rt->rt_gateway->sa_family != AF_LINK) {
 		printf("nd6_storelladdr: something odd happens\n");