aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.c
diff options
context:
space:
mode:
authorTom Goff <thomas.goff@ll.mit.edu>2016-06-23 16:11:57 -0400
committerDavid S. Miller <davem@davemloft.net>2016-06-28 04:14:09 -0400
commit70a0dec45174c976c64b4c8c1d0898581f759948 (patch)
treeacc1ab9dd7a035481710288508d57a0f0b34b7f0 /net/ipv4/ipmr.c
parentvsock: make listener child lock ordering explicit (diff)
downloadlinux-dev-70a0dec45174c976c64b4c8c1d0898581f759948.tar.xz
linux-dev-70a0dec45174c976c64b4c8c1d0898581f759948.zip
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/ipmr.c')
-rw-r--r--net/ipv4/ipmr.c4
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;
}