OSDN Git Service

net: neigh: use long type to store jiffies delta
authorEric Dumazet <edumazet@google.com>
Tue, 5 Nov 2019 22:11:49 +0000 (14:11 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jan 2020 09:21:50 +0000 (10:21 +0100)
[ Upstream commit 9d027e3a83f39b819e908e4e09084277a2e45e95 ]

A difference of two unsigned long needs long storage.

Fixes: c7fb64db001f ("[NETLINK]: Neighbour table configuration and statistics via rtnetlink")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/core/neighbour.c

index af1ecd0..9849f1f 100644 (file)
@@ -1837,8 +1837,8 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl,
                goto nla_put_failure;
        {
                unsigned long now = jiffies;
-               unsigned int flush_delta = now - tbl->last_flush;
-               unsigned int rand_delta = now - tbl->last_rand;
+               long flush_delta = now - tbl->last_flush;
+               long rand_delta = now - tbl->last_rand;
                struct neigh_hash_table *nht;
                struct ndt_config ndc = {
                        .ndtc_key_len           = tbl->key_len,