diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-04-17 17:33:08 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-04-17 23:41:15 -0400 |
| commit | 3940746d867f2f0390342dcb7ac06f1ed0e68027 (patch) | |
| tree | 7c709681615fd4635b456bfd27280065afa628e4 /net/core | |
| parent | net: Move fib_convert_metrics to metrics file (diff) | |
| download | linux-dev-3940746d867f2f0390342dcb7ac06f1ed0e68027.tar.xz linux-dev-3940746d867f2f0390342dcb7ac06f1ed0e68027.zip | |
net: Handle null dst in rtnl_put_cacheinfo
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 <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/rtnetlink.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 45936922d7e2..80802546c279 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -785,13 +785,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; |