diff options
| author | David Ahern <dsahern@gmail.com> | 2017-08-11 17:11:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-13 20:05:13 -0700 |
| commit | 1dfa76390bf056a49c1105b11f815a35a693b77c (patch) | |
| tree | 85e43990b22da13e99bb876186c17e0e39ea0483 /net/ipv4/ip_sockglue.c | |
| parent | 4f04256c983a4f115417d2009b44dcb7d70a6375 (diff) | |
| download | op-kernel-dev-1dfa76390bf056a49c1105b11f815a35a693b77c.zip op-kernel-dev-1dfa76390bf056a49c1105b11f815a35a693b77c.tar.gz | |
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: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
| -rw-r--r-- | net/ipv4/ip_sockglue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index dd68a9e..e558e4f 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c @@ -1207,6 +1207,7 @@ e_inval: 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); |
