Merge tag 'v5.2' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index fc81ae18cc44..e2b69e805d46 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -279,7 +279,8 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)
                 goto skip_tx_cleanup;
         }
 
-        if (!tls_complete_pending_work(sk, ctx, 0, &timeo))
+        if (unlikely(sk->sk_write_pending) &&
+            !wait_on_pending_writer(sk, &timeo))
                 tls_handle_open_record(sk, 0);
 
         /* We need these for tls_sw_fallback handling of other packets */