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

Commit 4d3c5c31 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

net: igmp: increase size of mr_ifc_count 



[ Upstream commit b69dd5b3780a7298bd893816a09da751bc0636f7 ]

Some arches support cmpxchg() on 4-byte and 8-byte only.
Increase mr_ifc_count width to 32bit to fix this problem.

Fixes: 4a2b285e7e10 ("net: igmp: fix data-race in igmp_ifc_timer_expire()")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210811195715.3684218-1-eric.dumazet@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 721ff564

include/linux/inetdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct in_device { 
	unsigned long		mr_qri;		/* Query Response Interval */

	unsigned char		mr_qrv;		/* Query Robustness Variable */

	unsigned char		mr_gq_running;

	unsigned char		mr_ifc_count;

	u32			mr_ifc_count;

	struct timer_list	mr_gq_timer;	/* general query timer */

	struct timer_list	mr_ifc_timer;	/* interface change timer */

net/ipv4/igmp.c

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ static void igmp_gq_timer_expire(struct timer_list *t) 
static void igmp_ifc_timer_expire(struct timer_list *t)

{

	struct in_device *in_dev = from_timer(in_dev, t, mr_ifc_timer);

	u8 mr_ifc_count;

	u32 mr_ifc_count;



	igmpv3_send_cr(in_dev);

restart: