Commit e16e888b authored by Markus Stenberg's avatar Markus Stenberg Committed by David S. Miller

ipv6: Fixed source specific default route handling.

If there are only IPv6 source specific default routes present, the
host gets -ENETUNREACH on e.g. connect() because ip6_dst_lookup_tail
calls ip6_route_output first, and given source address any, it fails,
and ip6_route_get_saddr is never called.

The change is to use the ip6_route_get_saddr, even if the initial
ip6_route_output fails, and then doing ip6_route_output _again_ after
we have appropriate source address available.

Note that this is '99% fix' to the problem; a correct fix would be to
do route lookups only within addrconf.c when picking a source address,
and never call ip6_route_output before source address has been
populated.
Signed-off-by: default avatarMarkus Stenberg <markus.stenberg@iki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a801445
...@@ -886,22 +886,45 @@ static int ip6_dst_lookup_tail(struct sock *sk, ...@@ -886,22 +886,45 @@ static int ip6_dst_lookup_tail(struct sock *sk,
#endif #endif
int err; int err;
if (!*dst) /* The correct way to handle this would be to do
*dst = ip6_route_output(net, sk, fl6); * ip6_route_get_saddr, and then ip6_route_output; however,
* the route-specific preferred source forces the
err = (*dst)->error; * ip6_route_output call _before_ ip6_route_get_saddr.
if (err) *
goto out_err_release; * In source specific routing (no src=any default route),
* ip6_route_output will fail given src=any saddr, though, so
* that's why we try it again later.
*/
if (ipv6_addr_any(&fl6->saddr) && (!*dst || !(*dst)->error)) {
struct rt6_info *rt;
bool had_dst = *dst != NULL;
if (ipv6_addr_any(&fl6->saddr)) { if (!had_dst)
struct rt6_info *rt = (struct rt6_info *) *dst; *dst = ip6_route_output(net, sk, fl6);
rt = (*dst)->error ? NULL : (struct rt6_info *)*dst;
err = ip6_route_get_saddr(net, rt, &fl6->daddr, err = ip6_route_get_saddr(net, rt, &fl6->daddr,
sk ? inet6_sk(sk)->srcprefs : 0, sk ? inet6_sk(sk)->srcprefs : 0,
&fl6->saddr); &fl6->saddr);
if (err) if (err)
goto out_err_release; goto out_err_release;
/* If we had an erroneous initial result, pretend it
* never existed and let the SA-enabled version take
* over.
*/
if (!had_dst && (*dst)->error) {
dst_release(*dst);
*dst = NULL;
}
} }
if (!*dst)
*dst = ip6_route_output(net, sk, fl6);
err = (*dst)->error;
if (err)
goto out_err_release;
#ifdef CONFIG_IPV6_OPTIMISTIC_DAD #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
/* /*
* Here if the dst entry we've looked up * Here if the dst entry we've looked up
......
...@@ -2245,9 +2245,10 @@ int ip6_route_get_saddr(struct net *net, ...@@ -2245,9 +2245,10 @@ int ip6_route_get_saddr(struct net *net,
unsigned int prefs, unsigned int prefs,
struct in6_addr *saddr) struct in6_addr *saddr)
{ {
struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); struct inet6_dev *idev =
rt ? ip6_dst_idev((struct dst_entry *)rt) : NULL;
int err = 0; int err = 0;
if (rt->rt6i_prefsrc.plen) if (rt && rt->rt6i_prefsrc.plen)
*saddr = rt->rt6i_prefsrc.addr; *saddr = rt->rt6i_prefsrc.addr;
else else
err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL, err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment