diff options
| author | Dave Watson <davejwatson@fb.com> | 2019-01-27 00:59:03 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-28 23:07:08 -0800 |
| commit | 1023121375c6b0b3dc00334983c762ba2b76cb19 (patch) | |
| tree | 82e20cb9fb7643d6c8f74851ebcecaa98c1cc5d9 /net/tls | |
| parent | 32eb67b93c9e3cd62cb423e30b090cdd4aa8d275 (diff) | |
| download | linux-1023121375c6b0b3dc00334983c762ba2b76cb19.tar.gz | |
net: tls: Fix deadlock in free_resources tx
If there are outstanding async tx requests (when crypto returns EINPROGRESS),
there is a potential deadlock: the tx work acquires the lock, while we
cancel_delayed_work_sync() while holding the lock. Drop the lock while waiting
for the work to complete.
Fixes: a42055e8d2c30 ("Add support for async encryption of records...")
Signed-off-by: Dave Watson <davejwatson@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tls')
| -rw-r--r-- | net/tls/tls_sw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 7e963560edef..bf5b54b513bc 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1794,7 +1794,9 @@ void tls_sw_free_resources_tx(struct sock *sk) if (atomic_read(&ctx->encrypt_pending)) crypto_wait_req(-EINPROGRESS, &ctx->async_wait); + release_sock(sk); cancel_delayed_work_sync(&ctx->tx_work.work); + lock_sock(sk); /* Tx whatever records we can transmit and abandon the rest */ tls_tx_records(sk, -1); |