From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:40324 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755000AbeCSDh2 (ORCPT ); Sun, 18 Mar 2018 23:37:28 -0400 Received: by mail-pf0-f196.google.com with SMTP id x1so6526636pfh.7 for ; Sun, 18 Mar 2018 20:37:28 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@idosch.org, roopa@cumulusnetworks.com, eric.dumazet@gmail.com, weiwan@google.com, kafai@fb.com, yoshfuji@linux-ipv6.org, David Ahern Subject: [PATCH RFC v2 net-next 02/21] net: Handle null dst in rtnl_put_cacheinfo Date: Sun, 18 Mar 2018 20:36:03 -0700 Message-Id: <20180319033622.16693-3-dsahern@gmail.com> In-Reply-To: <20180319033622.16693-1-dsahern@gmail.com> References: <20180319033622.16693-1-dsahern@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Need to keep expires time for IPv6 routes in a dump of FIB entries. Update rtnl_put_cacheinfo to allow dst to be NULL in which case rta_cacheinfo will only contain non-dst data. Signed-off-by: David Ahern --- net/core/rtnetlink.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 87079eaa871b..33d6ee808155 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -780,13 +780,15 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, long expires, u32 error) { struct rta_cacheinfo ci = { - .rta_lastuse = jiffies_delta_to_clock_t(jiffies - dst->lastuse), - .rta_used = dst->__use, - .rta_clntref = atomic_read(&(dst->__refcnt)), .rta_error = error, .rta_id = id, }; + if (dst) { + ci.rta_lastuse = jiffies_delta_to_clock_t(jiffies - dst->lastuse); + ci.rta_used = dst->__use; + ci.rta_clntref = atomic_read(&dst->__refcnt); + } if (expires) { unsigned long clock; -- 2.11.0