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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham 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 D1197C28CC0 for ; Sat, 1 Jun 2019 03:36:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB6E5270FD for ; Sat, 1 Jun 2019 03:36:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559360204; bh=vK4qSXdVzl6OFiPqMR/nzyBB1G1nEb8BxFbjt0bjVa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=i3MswMQkFtYuoyx34vWlsImZShhU1e56Mi3O2x4Fa+V79U1OkWKcYtGm0NklVMEqX pjb8CfyT2QluKlrMDrOGU4s2v8FarVWfH47q+5r+akJSkc/TpXfR3UpZ+/Cp0rn126 +hlUCz0XjP0M1puUK5GkxMzDSYGPYq9YPmX+H7B4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727101AbfFADgY (ORCPT ); Fri, 31 May 2019 23:36:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:51536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726428AbfFADgX (ORCPT ); Fri, 31 May 2019 23:36:23 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 36F12270E8; Sat, 1 Jun 2019 03:36:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559360183; bh=vK4qSXdVzl6OFiPqMR/nzyBB1G1nEb8BxFbjt0bjVa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uoEnWP39V6ThFY64mh4hxt/fnwkuGz0aRqWY8YSF1IVKgMp/juxSd2yuxXD0dbFA+ qbmTEhPs/l8o52w9Eg2/uGX8Ba/eaojA5USZltVpdJ9gpeRZY2wfy9dqk6VW6/v79r s0cCyDZVpIgvnJE/qqFZPfkYyfTtTCSxzfxyryi0= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: alexei.starovoitov@gmail.com, David Ahern Subject: [PATCH RFC net-next 16/27] ipv6: Handle all fib6_nh in a nexthop in rt6_do_redirect Date: Fri, 31 May 2019 20:36:07 -0700 Message-Id: <20190601033618.27702-17-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190601033618.27702-1-dsahern@kernel.org> References: <20190601033618.27702-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Use nexthop_for_each_fib6_nh and fib6_nh_find_match to find the fib6_nh in a nexthop that correlates to the device and gateway in the rt6_info. Signed-off-by: David Ahern --- net/ipv6/route.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index fbbceca19e50..bf682ab05044 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -3909,7 +3909,25 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu if (!res.f6i) goto out; - res.nh = res.f6i->fib6_nh; + if (res.f6i->nh) { + struct fib6_nh_match_arg arg = { + .dev = dst->dev, + .gw = &rt->rt6i_gateway, + }; + + nexthop_for_each_fib6_nh(res.f6i->nh, + fib6_nh_find_match, &arg); + + /* fib6_info uses a nexthop that does not have fib6_nh + * using the dst->dev. Should be impossible + */ + if (!arg.match) + return; + res.nh = arg.match; + } else { + res.nh = res.f6i->fib6_nh; + } + res.fib6_flags = res.f6i->fib6_flags; res.fib6_type = res.f6i->fib6_type; nrt = ip6_rt_cache_alloc(&res, &msg->dest, NULL); -- 2.11.0