diff options
| author |   mpi <mpi@openbsd.org> | 2015-08-19 10:42:37 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-08-19 10:42:37 +0000 |
| commit | 20ac2a89ce0f61fec21140d4eb91e29d3da181d2 (patch) | |
| tree | 54ff10d14a6db8c25ed3b3d2844a2e6ead552bfb | |
| parent | Remove XXX. (diff) | |
| download | wireguard-openbsd-20ac2a89ce0f61fec21140d4eb91e29d3da181d2.tar.xz wireguard-openbsd-20ac2a89ce0f61fec21140d4eb91e29d3da181d2.zip | |
Use rtfree(9) instead of decrementing rt_refcnt in rt_getifa().
Note that it is safe to keep a reference to the ifa pointed by a route
entry after freeing the entry iff the ifa is valid.
ok bluhm@
| -rw-r--r-- | sys/net/route.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index 53c629716a3..8b613dd5bb0 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.221 2015/08/18 08:56:16 mpi Exp $ */ +/* $OpenBSD: route.c,v 1.222 2015/08/19 10:42:37 mpi Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -660,14 +660,18 @@ ifa_ifwithroute(int flags, struct sockaddr *dst, struct sockaddr *gateway, struct rtentry *rt = rtalloc(gateway, 0, rtableid); if (rt == NULL) return (NULL); - rt->rt_refcnt--; /* The gateway must be local if the same address family. */ if ((rt->rt_flags & RTF_GATEWAY) && - rt_key(rt)->sa_family == dst->sa_family) + rt_key(rt)->sa_family == dst->sa_family) { + rtfree(rt); return (NULL); + } ifa = rt->rt_ifa; - if (ifa == NULL || ifa->ifa_ifp == NULL) + if (ifa == NULL || ifa->ifa_ifp == NULL) { + rtfree(rt); return (NULL); + } + rtfree(rt); } if (ifa->ifa_addr->sa_family != dst->sa_family) { struct ifaddr *oifa = ifa; |