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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 267A9C282DD for ; Tue, 23 Apr 2019 23:02:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8D05218DA for ; Tue, 23 Apr 2019 23:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556060561; bh=Yx1PNiL79nIgffLGGzYutgm9xDdiWBC/BA2BXMWhc2E=; h=From:To:Cc:Subject:Date:List-ID:From; b=A/qlaBevBMpzjkuMMRE228DYxqzZRWRBJFnfGiAQr8lgZyFjcUOxU5V/TPXpZ3NiM 9h1xa6DShPhPGgxl84j42mck2/QkbVbcsVxlTH7p824LTIHAUgG/NjPTy5PzP3B37/ 0SD33nNJKXMUJ7zKZYu4GLuHy/OC/ZNtR57JT/l8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727838AbfDWXCj (ORCPT ); Tue, 23 Apr 2019 19:02:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:50986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726325AbfDWXCj (ORCPT ); Tue, 23 Apr 2019 19:02:39 -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 BDFAE206BA; Tue, 23 Apr 2019 23:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556060558; bh=Yx1PNiL79nIgffLGGzYutgm9xDdiWBC/BA2BXMWhc2E=; h=From:To:Cc:Subject:Date:From; b=GSXetxlb2okIW/fCKsMf3b3Coenx2YY6vclCnHEUJD2p0zm623UrnKdYkH9mieb92 NZI+kNE5OtovFGDL669Hks0v/1VQlZNIUTjoYrOBawDqbls3SF6IxEjNy7+uuYe2K4 QToHqbd/d0WSTRoXoEITQh2LVv3UuMK42PQNWmH8= From: David Ahern To: davem@davemloft.net Cc: netdev@vger.kernel.org, idosch@mellanox.com, David Ahern Subject: [PATCH v2 net-next] mlxsw: spectrum_router: Prevent ipv6 gateway with v4 route via replace and append Date: Tue, 23 Apr 2019 16:03:29 -0700 Message-Id: <20190423230329.9469-1-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern mlxsw currently does not support v6 gateways with v4 routes. Commit 19a9d136f198 ("ipv4: Flag fib_info with a fib_nh using IPv6 gateway") prevents a route from being added, but nothing stops the replace or append. Add a catch for them too. $ ip ro add 172.16.2.0/24 via 10.99.1.2 $ ip ro replace 172.16.2.0/24 via inet6 fe80::202:ff:fe00:b dev swp1s0 Error: mlxsw_spectrum: IPv6 gateway with IPv4 route is not supported. $ ip ro append 172.16.2.0/24 via inet6 fe80::202:ff:fe00:b dev swp1s0 Error: mlxsw_spectrum: IPv6 gateway with IPv4 route is not supported. Signed-off-by: David Ahern --- v2 - added catch for append and moved up location to ADD case drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 8f31c2ddc538..1cda8a248b12 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -6105,6 +6105,8 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb, return notifier_from_errno(err); break; case FIB_EVENT_ENTRY_ADD: + case FIB_EVENT_ENTRY_REPLACE: /* fall through */ + case FIB_EVENT_ENTRY_APPEND: /* fall through */ if (router->aborted) { NL_SET_ERR_MSG_MOD(info->extack, "FIB offload was aborted. Not configuring route"); return notifier_from_errno(-EINVAL); -- 2.11.0