Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70a0dec4 authored by Tom Goff's avatar Tom Goff Committed by David S. Miller
Browse files

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: default avatarTom Goff <thomas.goff@ll.mit.edu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4192f672

net/ipv4/ipmr.c

+3 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

}