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

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

ip: Fix data-races around sysctl_ip_nonlocal_bind. 



[ Upstream commit 289d3b21fb0bfc94c4e98f10635bba1824e5f83c ]

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

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
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 7828309d

include/net/inet_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static inline bool inet_get_convert_csum(struct sock *sk) 
static inline bool inet_can_nonlocal_bind(struct net *net,

					  struct inet_sock *inet)

{

	return net->ipv4.sysctl_ip_nonlocal_bind ||

	return READ_ONCE(net->ipv4.sysctl_ip_nonlocal_bind) ||

		inet->freebind || inet->transparent;

}

net/sctp/protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static int sctp_v4_available(union sctp_addr *addr, struct sctp_sock *sp) 
	if (addr->v4.sin_addr.s_addr != htonl(INADDR_ANY) &&

	   ret != RTN_LOCAL &&

	   !sp->inet.freebind &&

	   !net->ipv4.sysctl_ip_nonlocal_bind)

	    !READ_ONCE(net->ipv4.sysctl_ip_nonlocal_bind))

		return 0;



	if (ipv6_only_sock(sctp_opt2sk(sp)))