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_HELO_NONE,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 DD964C43613 for ; Fri, 21 Jun 2019 23:27:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A767C206B7 for ; Fri, 21 Jun 2019 23:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561159631; bh=xnRd7i81N+JljCMp51ldXoOM80OaFuf3YHqkHx1mfmM=; h=From:To:Cc:Subject:Date:List-ID:From; b=HoexMBLOf4rL/7+fopJHuDNf/nFIzsyc1PL+o/FaYFZDJOWHibCIBP0me0eJ8q7mV Qd4+np5pk3yQACdk4NUnaNxk3GfxB4NlghhgQYH0gj7vd7L03nv53fn/NLP9kT391S 0+Vm2yYmt+h5Ut54giD75Q5d6ba3tHPgTAVgvfak= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726063AbfFUX1K (ORCPT ); Fri, 21 Jun 2019 19:27:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:44864 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726049AbfFUX1K (ORCPT ); Fri, 21 Jun 2019 19:27:10 -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 BC923206B7; Fri, 21 Jun 2019 23:27:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561159629; bh=xnRd7i81N+JljCMp51ldXoOM80OaFuf3YHqkHx1mfmM=; h=From:To:Cc:Subject:Date:From; b=ERxdyNe5dFlMF/7uWmfjBWMABW08jPPqbbeniTxgL/gBqLd5PH+l422WfzdCXUois S9L1OZ5GXpQxKXXfYDCVDd/cHLlfxuZuUujEtRsfmVSu61RSDWFhXaS6MxSCnFS5Z2 xlt2pdaSY2le1D/L7WQrhQ900m4KNPr0cmvpjE/o= From: David Ahern To: davem@davemloft.net Cc: netdev@vger.kernel.org, David Ahern Subject: [PATCH net-next] rtnetlink: skip metrics loop for dst_default_metrics Date: Fri, 21 Jun 2019 16:27:16 -0700 Message-Id: <20190621232716.26755-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 dst_default_metrics has all of the metrics initialized to 0, so nothing will be added to the skb in rtnetlink_put_metrics. Avoid the loop if metrics is from dst_default_metrics. Signed-off-by: David Ahern --- net/core/rtnetlink.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 8ac81630ab5c..1ee6460f8275 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -751,6 +751,10 @@ int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics) struct nlattr *mx; int i, valid = 0; + /* nothing is dumped for dst_default_metrics, so just skip the loop */ + if (metrics == dst_default_metrics.metrics) + return 0; + mx = nla_nest_start_noflag(skb, RTA_METRICS); if (mx == NULL) return -ENOBUFS; -- 2.11.0