android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tcp: annotate data-races around icsk->icsk_syn_retries"

Browse Source 
This reverts commit 9168bd8f54 which is
commit 3a037f0f3c4bfe44518f2fbb478aa2f99a9cd8bb upstream.

It breaks the Android abi.  If it is required in the future, it can come
back in an abi-safe way.

Bug: 161946584
Change-Id: Id57985508ae583aa995368a9efe6d27083a9fa01
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-08-04 07:21:31 +00:00
parent 938b8658b9
commit 08315eedaa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/inet_connection_sock.c
View File

@ -740,7 +740,7 @@ static void reqsk_timer_handler(struct timer_list *t)
if (inet_sk_state_load(sk_listener) != TCP_LISTEN)
goto drop;
max_syn_ack_retries = READ_ONCE(icsk->icsk_syn_retries) ? :
max_syn_ack_retries = icsk->icsk_syn_retries ? :
READ_ONCE(net->ipv4.sysctl_tcp_synack_retries);
/* Normally all the openreqs are young and become mature
* (i.e. converted to established socket) for first timeout.

6
net/ipv4/tcp.c
View File

@ -3045,7 +3045,7 @@ int tcp_sock_set_syncnt(struct sock *sk, int val)
return -EINVAL;
lock_sock(sk);
WRITE_ONCE(inet_csk(sk)->icsk_syn_retries, val);
inet_csk(sk)->icsk_syn_retries = val;
release_sock(sk);
return 0;
}
@ -3310,7 +3310,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname,
if (val < 1 || val > MAX_TCP_SYNCNT)
err = -EINVAL;
else
WRITE_ONCE(icsk->icsk_syn_retries, val);
icsk->icsk_syn_retries = val;
break;
case TCP_SAVE_SYN:
@ -3716,7 +3716,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
val = keepalive_probes(tp);
break;
case TCP_SYNCNT:
val = READ_ONCE(icsk->icsk_syn_retries) ? :
val = icsk->icsk_syn_retries ? :
READ_ONCE(net->ipv4.sysctl_tcp_syn_retries);
break;
case TCP_LINGER2: