lkml.org 
[lkml]   [2022]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 031/105] ip: Fix data-races around sysctl_ip_nonlocal_bind.
    Date
    From: Kuniyuki Iwashima <kuniyu@amazon.com>

    [ 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: 1da177e4c3f4 ("Linux-2.6.12-rc2")
    Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/net/inet_sock.h | 2 +-
    net/sctp/protocol.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
    index 89163ef8cf4b..f374946734b9 100644
    --- a/include/net/inet_sock.h
    +++ b/include/net/inet_sock.h
    @@ -369,7 +369,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;
    }

    diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
    index 940f1e257a90..6e4ca837e91d 100644
    --- a/net/sctp/protocol.c
    +++ b/net/sctp/protocol.c
    @@ -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)))
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-07-27 18:52    [W:5.694 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site