Commit 1dfa7639 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: ipv4: add check for l3slave for index returned in IP_PKTINFO 



Similar to the loopback device, for packets sent through a VRF device
the index returned in ipi_ifindex needs to be the saved index in
rt_iif.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f04256c

net/ipv4/ip_sockglue.c

+2 −1
Original line number Diff line number Diff line
@@ -1207,6 +1207,7 @@ static int do_ip_setsockopt(struct sock *sk, int level, 
void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb)

{

	struct in_pktinfo *pktinfo = PKTINFO_SKB_CB(skb);

	bool l3slave = ipv4_l3mdev_skb(IPCB(skb)->flags);

	bool prepare = (inet_sk(sk)->cmsg_flags & IP_CMSG_PKTINFO) ||

		       ipv6_sk_rxinfo(sk);
@@ -1220,7 +1221,7 @@ void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb) 
		 * (e.g., process binds socket to eth0 for Tx which is

		 * redirected to loopback in the rtable/dst).

		 */

		if (pktinfo->ipi_ifindex == LOOPBACK_IFINDEX)

		if (pktinfo->ipi_ifindex == LOOPBACK_IFINDEX || l3slave)

			pktinfo->ipi_ifindex = inet_iif(skb);



		pktinfo->ipi_spec_dst.s_addr = fib_compute_spec_dst(skb);