net: ipv6: Dont add RT6_LOOKUP_F_IFACE flag if saddr set
741a11d9e4
("net: ipv6: Add RT6_LOOKUP_F_IFACE flag if oif is set") adds the RT6_LOOKUP_F_IFACE flag to make device index mismatch fatal if oif is given. Hajime reported that this change breaks the Mobile IPv6 use case that wants to force the message through one interface yet use the source address from another interface. Handle this case by only adding the flag if oif is set and saddr is not set. Fixes:741a11d9e4
("net: ipv6: Add RT6_LOOKUP_F_IFACE flag if oif is set") Cc: Hajime Tazaki <thehajime@gmail.com> Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
92a93fd5bb
commit
d46a9d678e
1 changed files with 4 additions and 2 deletions
|
@ -1193,14 +1193,16 @@ struct dst_entry *ip6_route_output(struct net *net, const struct sock *sk,
|
|||
struct flowi6 *fl6)
|
||||
{
|
||||
int flags = 0;
|
||||
bool any_src;
|
||||
|
||||
fl6->flowi6_iif = LOOPBACK_IFINDEX;
|
||||
|
||||
any_src = ipv6_addr_any(&fl6->saddr);
|
||||
if ((sk && sk->sk_bound_dev_if) || rt6_need_strict(&fl6->daddr) ||
|
||||
fl6->flowi6_oif)
|
||||
(fl6->flowi6_oif && any_src))
|
||||
flags |= RT6_LOOKUP_F_IFACE;
|
||||
|
||||
if (!ipv6_addr_any(&fl6->saddr))
|
||||
if (!any_src)
|
||||
flags |= RT6_LOOKUP_F_HAS_SADDR;
|
||||
else if (sk)
|
||||
flags |= rt6_srcprefs2flags(inet6_sk(sk)->srcprefs);
|
||||
|
|
Loading…
Add table
Reference in a new issue