diff options
author | Tom Goff <thomas.goff@ll.mit.edu> | 2016-06-23 22:11:57 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-28 10:14:09 +0200 |
commit | 70a0dec45174c976c64b4c8c1d0898581f759948 (patch) | |
tree | acc1ab9dd7a035481710288508d57a0f0b34b7f0 /net/ipv6 | |
parent | vsock: make listener child lock ordering explicit (diff) | |
download | linux-70a0dec45174c976c64b4c8c1d0898581f759948.tar.xz linux-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/ipv6')
-rw-r--r-- | net/ipv6/ip6mr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index f2e2013f8346..487ef3bc7bbc 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1074,6 +1074,7 @@ static struct mfc6_cache *ip6mr_cache_alloc(void) struct mfc6_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL); if (!c) return NULL; + c->mfc_un.res.last_assert = jiffies - MFC_ASSERT_THRESH - 1; c->mfc_un.res.minvif = MAXMIFS; return c; } |