summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2019-11-05 14:11:49 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-27 14:51:21 +0100
commitd261a03d8cac78006f2f28c6f950429f1588fb07 (patch)
tree169df917132b6625697e386890765db72a2d1a61
parentced84017c91461d480a1cc35367e07bcaf803256 (diff)
downloadlinux-stable-d261a03d8cac78006f2f28c6f950429f1588fb07.tar.gz
linux-stable-d261a03d8cac78006f2f28c6f950429f1588fb07.tar.bz2
linux-stable-d261a03d8cac78006f2f28c6f950429f1588fb07.zip
net: neigh: use long type to store jiffies delta
[ 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>
-rw-r--r--net/core/neighbour.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index e260d44ebdca..bf738ec68cb5 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1885,8 +1885,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,