ipmr/ip6mr: Initialize the last assert time of mfc entries.

PATCH New Tom Goff 1 participant 1 message Jun 23, 2016

Subsystems (3)

Networking Network drivers IPv4/IPv6

lore

Share & tools

lore

Tom Goff

author

2016-06-23 20:28 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 net/ipv4/ipmr.c  | 4 +++-
 net/ipv6/ip6mr.c | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

net/ipv4/ipmr.c +3 -1

index 21a38e2..5ad48ec 100644
@@ -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;
 }

net/ipv6/ip6mr.c +1 -0

index f2e2013f8..487ef3b 100644
@@ -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;
 }

Signature · 1 line

1.9.1