diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-07-05 09:17:11 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-07-05 09:17:11 +0000 |
| commit | 16c1e0176101f4ef86917f0014fcbb19b6b12b78 (patch) | |
| tree | 798a16165c01e722d6454d99150f3087d9809da3 | |
| parent | 07b41d724d43b24bf5c323d12c2cdb3d898d9eef (diff) | |
Do not use ``rt_addr'' in in{6,}_selectsrc() it doesn't work with magic
addresses set on p2p interfaces.
Found the hardway by naddy@
| -rw-r--r-- | sys/netinet/in_pcb.c | 17 | ||||
| -rw-r--r-- | sys/netinet6/in6_src.c | 9 |
2 files changed, 12 insertions, 14 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 24526a9e6bd..a1ad89bb637 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.c,v 1.208 2016/06/30 12:36:27 mpi Exp $ */ +/* $OpenBSD: in_pcb.c,v 1.209 2016/07/05 09:17:10 mpi Exp $ */ /* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */ /* @@ -879,6 +879,7 @@ in_selectsrc(struct in_addr **insrc, struct sockaddr_in *sin, u_int rtableid) { struct sockaddr_in *sin2; + struct in_ifaddr *ia = NULL; /* * If the socket(if any) is already bound, use that bound address @@ -900,8 +901,6 @@ in_selectsrc(struct in_addr **insrc, struct sockaddr_in *sin, ifp = if_get(mopts->imo_ifidx); if (ifp != NULL) { - struct in_ifaddr *ia = NULL; - if (ifp->if_rdomain == rtable_l2(rtableid)) IFP_TO_IA(ifp, ia); if (ia == NULL) { @@ -942,12 +941,14 @@ in_selectsrc(struct in_addr **insrc, struct sockaddr_in *sin, * If we found a route, use the address * corresponding to the outgoing interface. */ - if (ro->ro_rt != NULL) { - *insrc = &satosin(ro->ro_rt->rt_addr)->sin_addr; - return (0); - } + if (ro->ro_rt != NULL) + ia = ifatoia(ro->ro_rt->rt_ifa); - return (EADDRNOTAVAIL); + if (ia == NULL) + return (EADDRNOTAVAIL); + + *insrc = &ia->ia_addr.sin_addr; + return (0); } void diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index b26e0e645d2..6cecd702199 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_src.c,v 1.74 2016/06/30 12:36:27 mpi Exp $ */ +/* $OpenBSD: in6_src.c,v 1.75 2016/07/05 09:17:10 mpi Exp $ */ /* $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $ */ /* @@ -257,11 +257,8 @@ in6_selectsrc(struct in6_addr **in6src, struct sockaddr_in6 *dstsock, ia6 = in6_ifawithscope(ifp, dst, rtableid); if_put(ifp); } - if (ia6 == NULL) { /* xxx scope error ?*/ - *in6src = - &satosin6(ro->ro_rt->rt_addr)->sin6_addr; - return (0); - } + if (ia6 == NULL) /* xxx scope error ?*/ + ia6 = ifatoia6(ro->ro_rt->rt_ifa); } if (ia6 == NULL) return (EHOSTUNREACH); /* no route */ |