Commit a0a9f33b authored Jul 15, 2015 by Phil Sutter Committed by David S. Miller Jul 20, 2015

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>

parent 22f94e62

net/ipv6/ip6_output.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}