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

Commit fc92e3b4 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Greg Kroah-Hartman
Browse files

ip: Fix a data-race around sysctl_fwmark_reflect. 



[ Upstream commit 85d0b4dbd74b95cc492b1f4e34497d3f894f5d9a ]

While reading sysctl_fwmark_reflect, it can be changed concurrently.
Thus, we need to add READ_ONCE() to its reader.

Fixes: e110861f ("net: add a sysctl to reflect the fwmark on replies")
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3bbd8680

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ void ipfrag_init(void); 
void ip_static_sysctl_init(void);



#define IP4_REPLY_MARK(net, mark) \

	((net)->ipv4.sysctl_fwmark_reflect ? (mark) : 0)

	(READ_ONCE((net)->ipv4.sysctl_fwmark_reflect) ? (mark) : 0)



static inline bool ip_is_fragment(const struct iphdr *iph)

{