diff options
author | Tom Goff <thomas.goff@ll.mit.edu> | 2016-06-23 23:11:57 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-28 11:14:09 +0300 |
commit | 70a0dec45174c976c64b4c8c1d0898581f759948 (patch) | |
tree | acc1ab9dd7a035481710288508d57a0f0b34b7f0 /net/ipv4 | |
parent | 4192f672fae559f32d82de72a677701853cc98a7 (diff) | |
download | linux-70a0dec45174c976c64b4c8c1d0898581f759948.tar.xz |
ipmr/ip6mr: Initialize the last assert time of mfc entries.
This fixes wrong-interface signaling on 32-bit platforms for entries
created when jiffies > 2^31 + MFC_ASSERT_THRESH.
Signed-off-by: Tom Goff <thomas.goff@ll.mit.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 21a38e296fe2..5ad48ec77710 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -891,8 +891,10 @@ static struct mfc_cache *ipmr_cache_alloc(void) { struct mfc_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL); - if (c) + if (c) { + c->mfc_un.res.last_assert = jiffies - MFC_ASSERT_THRESH - 1; c->mfc_un.res.minvif = MAXVIFS; + } return c; } |