diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-13 14:56:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-13 14:56:50 +0300 |
| commit | 7d5424b26f17b74d94e73815718b424ad207a3e7 (patch) | |
| tree | a571db15de0e5ac08997aab9705356eff39685b6 /drivers/net/ethernet | |
| parent | 22b9c41a3fb8ef4624bcda312665937d2ba98aa7 (diff) | |
| parent | bdf00bf24bef9be1ca641a6390fd5487873e0d2e (diff) | |
| download | linux-7d5424b26f17b74d94e73815718b424ad207a3e7.tar.xz | |
Merge branch 'net-sysctl-races'
Kuniyuki Iwashima says:
====================
sysctl: Fix data-races around ipv4_net_table (Roun).
This series fixes data-races around the first 13 knobs and
nexthop_compat_mode in ipv4_net_table.
I will post another patch for three early_demux knobs later,
so the next round will start from ip_default_ttl.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c index 4af5561cbfc5..7c760aa65540 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c @@ -1392,7 +1392,7 @@ static void chtls_pass_accept_request(struct sock *sk, th_ecn = tcph->ece && tcph->cwr; if (th_ecn) { ect = !INET_ECN_is_not_ect(ip_dsfield); - ecn_ok = sock_net(sk)->ipv4.sysctl_tcp_ecn; + ecn_ok = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_ecn); if ((!ect && ecn_ok) || tcp_ca_needs_ecn(sk)) inet_rsk(oreq)->ecn_ok = 1; } |