| Message ID | 1478215046-18806-1-git-send-email-dsa@cumulusnetworks.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: David Ahern <dsa@cumulusnetworks.com> Date: Thu, 3 Nov 2016 16:17:26 -0700 > 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> Applied and queued up for -stable, thanks David.
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
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> --- net/ipv6/icmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)