diff options
| author | Phil Sutter <phil@nwl.cc> | 2015-07-15 21:56:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-20 21:59:32 +0200 |
| commit | a0a9f33bdf8bf9061c31faab46d8eb46ff644622 (patch) | |
| tree | efcf1e177085ba336c29320c099fcb046de5b245 | |
| parent | bonding: trivial: remove unused variables (diff) | |
| download | linux-a0a9f33bdf8bf9061c31faab46d8eb46ff644622.tar.xz linux-a0a9f33bdf8bf9061c31faab46d8eb46ff644622.zip | |
net/ipv6: update flowi6_oif in ip6_dst_lookup_flow if not set
Newly created flows don't have flowi6_oif set (at least if the
associated socket is not interface-bound). This leads to a mismatch in
__xfrm6_selector_match() for policies which specify an interface in the
selector (sel->ifindex != 0).
Backtracing shows this happens in code-paths originating from e.g.
ip6_datagram_connect(), rawv6_sendmsg() or tcp_v6_connect(). (UDP was
not tested for.)
In summary, this patch fixes policy matching on outgoing interface for
locally generated packets.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index d5f7716662db..c5fc85286ef6 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1023,6 +1023,8 @@ struct dst_entry *ip6_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6, return ERR_PTR(err); if (final_dst) fl6->daddr = *final_dst; + if (!fl6->flowi6_oif) + fl6->flowi6_oif = dst->dev->ifindex; return xfrm_lookup_route(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0); } |