From patchwork Tue Oct 9 16:10:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 148507 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp5091976lji; Tue, 9 Oct 2018 09:10:43 -0700 (PDT) X-Google-Smtp-Source: ACcGV60teZtGUu5ggODCS6tLC5pIaC8QTqMvC1LHJtaT+LoByN7vo69TftVjlfRXziTpaAuFlP0k X-Received: by 2002:a63:2f42:: with SMTP id v63-v6mr26037972pgv.298.1539101443265; Tue, 09 Oct 2018 09:10:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539101443; cv=none; d=google.com; s=arc-20160816; b=moPeGC/dXkZOu0cmoEBH+wxFvVvQlQ1is/qgi5Gw0/eajZQO4ug4ja1s+lmQEIn9/E +G0+8zSidoIHeSu6CIu0OTFYC3aEOKcgaWP/tfTJWXU2WorYzBmxWAGALr07vF4baJ1j buceDMCvNkJkz6Qtj5z+02/4wpuhnQYrPckOwIE+tOXIDgDOIddIy6a/hGM8PoZjowOd XOX8vXrlWBMuLkCHVS6TqxHCuBfVYcyFroAT5rcB7KvJirLbXAvhyJw+bu555XYbgqHL CuoDUd3aS+i5Pwvhq7kfdxThZge9T0Xnn7dAd9jW9xvEoJEATM7t37zEftFu/4IzOXYV cSqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=tWoeJJG5F17AShgM2c29qgUc0QhY2m2+TcQbyeQXWTw=; b=zbTlIPx/3KdsgL3MSHf9u0bWYRU7LKJaNq83aZO1BkBtEZQJxorfNhOp+P3xOhYm0G lKg0G+VnEmUw0vSi7nqWgtL9xCAXsKx5c+/kIwC8IfUqCjUuIuaibLDaG0TC6fekkEfe Ix46Z7JC2L07YGUpqfRqCKRLvrw2n43b/JZ96FlnzHc2c5MPlLaXEcqZX6EcyWAEl88o VJSoFZ4g+oG5sDBX73NPJ6O4toxKu9gMSyC+pZHYvXy/or6e46CaCngtE8Oh9NqTEM1A SRBuXZWMIq0kVHr2zyak5j0+rfdKsrsO5dH3aYpJ03Y4rWGYUH/+aQPr6tdLODUwT/W+ s0+w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3-v6si20228794pld.351.2018.10.09.09.10.42; Tue, 09 Oct 2018 09:10:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726976AbeJIX2T (ORCPT + 32 others); Tue, 9 Oct 2018 19:28:19 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:48509 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726468AbeJIX2T (ORCPT ); Tue, 9 Oct 2018 19:28:19 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MsIfc-1fqSjD2rT0-00thRQ; Tue, 09 Oct 2018 18:10:33 +0200 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MsIfc-1fqSjD2rT0-00thRQ; Tue, 09 Oct 2018 18:10:33 +0200 From: Arnd Bergmann To: "David S. Miller" , David Ahern Cc: Arnd Bergmann , Kirill Tkhai , Christian Brauner , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] rtnetlink: mpls: ip_valid_fib_dump_req() requires CONFIG_INET Date: Tue, 9 Oct 2018 18:10:00 +0200 Message-Id: <20181009161031.1003047-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:gYU7UJ5LP7ExJd37mcfS6X2eohe8grJumnPMznB/MYZMZKhbhi4 ODLImYjUUNblwjFohhyRtZprosbU8eBu0atAEzUjnJcivOSu7NGEHUBDPoHyyKU/triqRVL UwMD3L2O16guCJZER3qruhLf8P8ApRmmq0HXdnGubkEPiTbgFlfLm0kx6GCDpTEiwdgrYgf KIoE4DyEgBwuIQiHKLpPg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:HEoUs3kZzss=:L7ylgr1OsUltW7ZbByyW0h cTynn9a2QQwZnKl2sEny/nuG28nQbhX+B2YdsRTagp9ItsPjy5e3HlRRsrPLoeliGdnsu8N9+ C/wfHl78uw1N7C1qzSLAzePZ9Bky+dmmFgVFCJivCXcxnfhk596nOs/kAy4Ts0WVyOIGVDCD0 0wYxP2dwuPMzM5b4jPLzOOT+tEpHK1LfBUYp5z3bxC/YZ3JbvicRCH7Eeg1yM3Idm0Tdoz9Sl Ws+GX6rQQqnn1JWBh3qNJoXi5fZ+aO+kc/w25KH006t1+WQAun3fIPoiKkQMZJjykGkUkbB2/ pn3aY6Yk+k3pCyW9sg0BFq3xSTy5RcBBmA1yLvloJMIoAvtKBOooe1+SOEMFnqwnfFc+wYMxe 5TaeXnvzjxjWmrgtFi4f4Ds/BAcbyxrPYEolWiNX/xblpTaiXUhNnju/I3qHo4GLC9PEjuKZa 0rY3DC8uy0+c3k4MCQEc7FfzC9ahcqFF/n/fKxRzWyfO2UWzN40N3t0lwwxQ7iFTNEWvXlcs8 QZeRkzQyZEVVfe/dS3BnAlqJrIEwmQJflCLqLOJHgyg/O0a6zyBzh5XvapwHJKPp30gGvFGll +yCdl5gZRg4qLeb/+NvtShc1Lt8ysYDEt5iU58dfuLAWWvws7XdM+aJYtTXegf2j65jyD+79w TFieC/IuK8p0ZFrBk0fUZbkMRCS0DGP9ebDDVLWTTHXoAHGn6PcfpCw7wHTX+dP7rMSo= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added call to ip_valid_fib_dump_req() causes a link error in configurations that enable MPLS but not IPv4: net/mpls/af_mpls.o: In function `mpls_dump_routes': af_mpls.c:(.text+0xed0): undefined reference to `ip_valid_fib_dump_req' With the added IS_ENABLED() check we get the previous behavior back in that configuration, and skip the check. Fixes: e8ba330ac0c5 ("rtnetlink: Update fib dumps for strict data checking") Signed-off-by: Arnd Bergmann --- net/mpls/af_mpls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 7f891ffffc05..99ff6114d513 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -2041,7 +2041,7 @@ static int mpls_dump_routes(struct sk_buff *skb, struct netlink_callback *cb) ASSERT_RTNL(); - if (cb->strict_check) { + if (IS_ENABLED(CONFIG_INET) && cb->strict_check) { int err = ip_valid_fib_dump_req(nlh, cb->extack); if (err < 0)