From patchwork Tue Mar 17 10:53:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229249 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 3D5F1C2BB1D for ; Tue, 17 Mar 2020 11:16:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0AB520658 for ; Tue, 17 Mar 2020 11:16:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443794; bh=WNNeA3JITfKxApQy3OEVpUyCpZiwFtvxWUGcE/gSiJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VtFf8Afqoi3T5iYe961IgkGqenBsB0RIUl4TuRPCORq0fLnIjft9ac8h97T2LnQag 3e/zgfQoii7SBoGIfpOeiOiqdQqGQIKnLHdHXc3YXAI84Wmjvtxw2OsS+1Yu4KGrwP EXo6mvogsgtGTjoVa1sjpupFBYuEYQ1ZmjPYennw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728755AbgCQLJU (ORCPT ); Tue, 17 Mar 2020 07:09:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:51554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728940AbgCQLJT (ORCPT ); Tue, 17 Mar 2020 07:09:19 -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 B6B0720714; Tue, 17 Mar 2020 11:09:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443359; bh=WNNeA3JITfKxApQy3OEVpUyCpZiwFtvxWUGcE/gSiJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y7v9ypkHKgFoNacOl5ZKsDKd9QI9HNjEX2+lkgWsfqWc9f5pMwklVftCvjctFAoeW Vl39bFmnyvCfL88DhksgbKzW60NnZ5VgVZZd5bh6DTipKVKdVkO6XpwrN4lfrXJQ/C nyKxlgwvx8QssKZqjmIzK9k0xZu4Zkcg8LUjrKQM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jianlin Shi , David Ahern , Hangbin Liu , "David S. Miller" Subject: [PATCH 5.5 019/151] net/ipv6: use configured metric when add peer route Date: Tue, 17 Mar 2020 11:53:49 +0100 Message-Id: <20200317103328.206419095@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103326.593639086@linuxfoundation.org> References: <20200317103326.593639086@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hangbin Liu [ Upstream commit 07758eb9ff52794fba15d03aa88d92dbd1b7d125 ] When we add peer address with metric configured, IPv4 could set the dest metric correctly, but IPv6 do not. e.g. ]# ip addr add 192.0.2.1 peer 192.0.2.2/32 dev eth1 metric 20 ]# ip route show dev eth1 192.0.2.2 proto kernel scope link src 192.0.2.1 metric 20 ]# ip addr add 2001:db8::1 peer 2001:db8::2/128 dev eth1 metric 20 ]# ip -6 route show dev eth1 2001:db8::1 proto kernel metric 20 pref medium 2001:db8::2 proto kernel metric 256 pref medium Fix this by using configured metric instead of default one. Reported-by: Jianlin Shi Fixes: 8308f3ff1753 ("net/ipv6: Add support for specifying metric of connected routes") Reviewed-by: David Ahern Signed-off-by: Hangbin Liu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv6/addrconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5987,9 +5987,9 @@ static void __ipv6_ifa_notify(int event, if (ifp->idev->cnf.forwarding) addrconf_join_anycast(ifp); if (!ipv6_addr_any(&ifp->peer_addr)) - addrconf_prefix_route(&ifp->peer_addr, 128, 0, - ifp->idev->dev, 0, 0, - GFP_ATOMIC); + addrconf_prefix_route(&ifp->peer_addr, 128, + ifp->rt_priority, ifp->idev->dev, + 0, 0, GFP_ATOMIC); break; case RTM_DELADDR: if (ifp->idev->cnf.forwarding)