diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2016-11-03 16:17:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-21 10:11:35 +0100 |
| commit | 92fd1c1f2fd27a352b91ad1f874775618aa1865a (patch) | |
| tree | 1f5fe15c19634573c1d78fdf6dacd712fda0b091 /net | |
| parent | 09ee09498bcae967b6bde03940c8ba45dcd19875 (diff) | |
| download | lwn-92fd1c1f2fd27a352b91ad1f874775618aa1865a.tar.gz lwn-92fd1c1f2fd27a352b91ad1f874775618aa1865a.zip | |
net: icmp6_send should use dst dev to determine L3 domain
[ Upstream commit 5d41ce29e3b91ef305f88d23f72b3359de329cec ]
icmp6_send is called in response to some event. The skb may not have
the device set (skb->dev is NULL), but it is expected to have a dst set.
Update icmp6_send to use the dst on the skb to determine L3 domain.
Fixes: ca254490c8dfd ("net: Add VRF support to IPv6 stack")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index bd59c343d35f..7370ad2e693a 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -448,7 +448,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, if (__ipv6_addr_needs_scope_id(addr_type)) iif = skb->dev->ifindex; else - iif = l3mdev_master_ifindex(skb->dev); + iif = l3mdev_master_ifindex(skb_dst(skb)->dev); /* * Must not send error if the source does not uniquely |