summaryrefslogtreecommitdiffstats
path: root/sys/net/route.c
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2005-08-09 08:39:56 +0000
committerglebius <glebius@FreeBSD.org>2005-08-09 08:39:56 +0000
commitf2edd835a70c8c4dbde8caf8d9f28cc02446c2c2 (patch)
tree583b93a3034a3becc01bc742fa977a85601c9cff /sys/net/route.c
parent4d15123a5e5e6ac11cc9299d2b1775e0d8f14e54 (diff)
downloadFreeBSD-src-f2edd835a70c8c4dbde8caf8d9f28cc02446c2c2.zip
FreeBSD-src-f2edd835a70c8c4dbde8caf8d9f28cc02446c2c2.tar.gz
In preparation for fixing races in ARP (and probably in other
L2/L3 mappings) make rt_check() return a locked rtentry.
Diffstat (limited to 'sys/net/route.c')
-rw-r--r--sys/net/route.c7
1 files changed, 4 insertions, 3 deletions
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:
OpenPOWER on IntegriCloud