xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tcp: Fix data-races around sysctl_tcp_syn(ack)?_retries."

Browse Source 
This reverts commit 7b0084918c which is
commit 20a3b1c0f603e8c55c3396abd12dfcfb523e4d3c 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: Id6fdb41a7797ed851cc37b4fe141fc69a069b640
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-08-04 07:21:40 +00:00
parent 08315eedaa
commit 2afed824a4
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/inet_connection_sock.c
View File

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

3
net/ipv4/tcp.c
View File

@@ -3716,8 +3716,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
val = keepalive_probes(tp); val = keepalive_probes(tp);
break; break;
case TCP_SYNCNT: case TCP_SYNCNT:
val = icsk->icsk_syn_retries ? : val = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_syn_retries;
READ_ONCE(net->ipv4.sysctl_tcp_syn_retries);
break; break;
case TCP_LINGER2: case TCP_LINGER2:
val = READ_ONCE(tp->linger2); val = READ_ONCE(tp->linger2);

10
net/ipv4/tcp_timer.c
View File

@@ -239,8 +239,7 @@ static int tcp_write_timeout(struct sock *sk)
if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) { if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV)) {
if (icsk->icsk_retransmits) if (icsk->icsk_retransmits)
__dst_negative_advice(sk); __dst_negative_advice(sk);
retry_until = icsk->icsk_syn_retries ? : retry_until = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_syn_retries;
READ_ONCE(net->ipv4.sysctl_tcp_syn_retries);
expired = icsk->icsk_retransmits >= retry_until; expired = icsk->icsk_retransmits >= retry_until;
} else { } else {
if (retransmits_timed_out(sk, READ_ONCE(net->ipv4.sysctl_tcp_retries1), 0)) { if (retransmits_timed_out(sk, READ_ONCE(net->ipv4.sysctl_tcp_retries1), 0)) {
@@ -407,15 +406,12 @@ abort: tcp_write_err(sk);
static void tcp_fastopen_synack_timer(struct sock *sk, struct request_sock *req) static void tcp_fastopen_synack_timer(struct sock *sk, struct request_sock *req)
{ {
struct inet_connection_sock *icsk = inet_csk(sk); struct inet_connection_sock *icsk = inet_csk(sk);
int max_retries = icsk->icsk_syn_retries ? :
sock_net(sk)->ipv4.sysctl_tcp_synack_retries + 1; /* add one more retry for fastopen */
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
int max_retries;
req->rsk_ops->syn_ack_timeout(req); req->rsk_ops->syn_ack_timeout(req);
/* add one more retry for fastopen */
max_retries = icsk->icsk_syn_retries ? :
READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_synack_retries) + 1;
if (req->num_timeout >= max_retries) { if (req->num_timeout >= max_retries) {
tcp_write_err(sk); tcp_write_err(sk);
return; return;