Commit 289d3b21 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller

ip: Fix data-races around sysctl_ip_nonlocal_bind.

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>
parent 7bf9e18d
...@@ -374,7 +374,7 @@ static inline bool inet_get_convert_csum(struct sock *sk) ...@@ -374,7 +374,7 @@ static inline bool inet_get_convert_csum(struct sock *sk)
static inline bool inet_can_nonlocal_bind(struct net *net, static inline bool inet_can_nonlocal_bind(struct net *net,
struct inet_sock *inet) struct inet_sock *inet)
{ {
return net->ipv4.sysctl_ip_nonlocal_bind || return READ_ONCE(net->ipv4.sysctl_ip_nonlocal_bind) ||
inet->freebind || inet->transparent; inet->freebind || inet->transparent;
} }
......
...@@ -358,7 +358,7 @@ static int sctp_v4_available(union sctp_addr *addr, struct sctp_sock *sp) ...@@ -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) && if (addr->v4.sin_addr.s_addr != htonl(INADDR_ANY) &&
ret != RTN_LOCAL && ret != RTN_LOCAL &&
!sp->inet.freebind && !sp->inet.freebind &&
!net->ipv4.sysctl_ip_nonlocal_bind) !READ_ONCE(net->ipv4.sysctl_ip_nonlocal_bind))
return 0; return 0;
if (ipv6_only_sock(sctp_opt2sk(sp))) if (ipv6_only_sock(sctp_opt2sk(sp)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment