| From foo@baz Wed Jul 6 16:50:56 PDT 2016 |
| From: Tom Goff <thomas.goff@ll.mit.edu> |
| Date: Thu, 23 Jun 2016 16:11:57 -0400 |
| Subject: ipmr/ip6mr: Initialize the last assert time of mfc entries. |
| |
| From: Tom Goff <thomas.goff@ll.mit.edu> |
| |
| [ Upstream commit 70a0dec45174c976c64b4c8c1d0898581f759948 ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv4/ipmr.c | 4 +++- |
| net/ipv6/ip6mr.c | 1 + |
| 2 files changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/net/ipv4/ipmr.c |
| +++ b/net/ipv4/ipmr.c |
| @@ -891,8 +891,10 @@ static struct mfc_cache *ipmr_cache_allo |
| { |
| 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; |
| } |
| |
| --- a/net/ipv6/ip6mr.c |
| +++ b/net/ipv6/ip6mr.c |
| @@ -1074,6 +1074,7 @@ static struct mfc6_cache *ip6mr_cache_al |
| 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; |
| } |