From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79223C38A2A for ; Fri, 8 May 2020 13:14:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F305206B8 for ; Fri, 8 May 2020 13:14:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588943671; bh=L6fhEOE9L+MH7BX7fO5lV0ujd11NRggPnd/JTncYjGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xoUgF99CyYmIi6KCqYzhIAx1/Fz5J/6pczRmaGNsRlZXZEPZT0Wlwx1nCtM2xJx61 pHam5LYbNBAuJD1rXbwb8bSu+A3QOjQo8jqRZueBd5Ic897XxRsS2mjBlW8DWxn8b3 IDutXDExudSdb72l2buXeOnI5rtv2mDbiafeBM+4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729507AbgEHMrC (ORCPT ); Fri, 8 May 2020 08:47:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:49006 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729505AbgEHMrB (ORCPT ); Fri, 8 May 2020 08:47:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EFE062145D; Fri, 8 May 2020 12:47:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942021; bh=L6fhEOE9L+MH7BX7fO5lV0ujd11NRggPnd/JTncYjGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gDuJHgfxF+ectFaSw3sKd4ZziclLu8CXMZ9rlo8eaXn2LvYjnYLCTGTI+8CvVruqW wgmnM1TS6bLRd4mVtzsImX7lyzHc61wRPxGko2lLfn5JhquRM7+/AuJ/47+JmSedKP TKttWZin72tfln16FvES4OnpQjl3GAKXZan+7KtY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Ahern , "David S. Miller" Subject: [PATCH 4.4 264/312] net: icmp6_send should use dst dev to determine L3 domain Date: Fri, 8 May 2020 14:34:15 +0200 Message-Id: <20200508123143.005408652@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: David Ahern commit 5d41ce29e3b91ef305f88d23f72b3359de329cec upstream. 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/icmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -446,7 +446,7 @@ static void icmp6_send(struct sk_buff *s 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