diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-04-19 16:51:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-02 09:59:01 +0200 |
| commit | d3bdd359fa53c1d577bc96677474c43bfb9090bd (patch) | |
| tree | 444511db75d5f85ef2afeeb1100d4e902c5f52f8 /net | |
| parent | 041b3224e8f848b2024cae470ea49c46db92ffd3 (diff) | |
| download | linux-stable-d3bdd359fa53c1d577bc96677474c43bfb9090bd.tar.gz linux-stable-d3bdd359fa53c1d577bc96677474c43bfb9090bd.tar.bz2 linux-stable-d3bdd359fa53c1d577bc96677474c43bfb9090bd.zip | |
net/tls: avoid potential deadlock in tls_set_device_offload_rx()
[ Upstream commit 62ef81d5632634d5e310ed25b9b940b2b6612b46 ]
If device supports offload, but offload fails tls_set_device_offload_rx()
will call tls_sw_free_resources_rx() which (unhelpfully) releases
and reacquires the socket lock.
For a small fix release and reacquire the device_offload_lock.
Fixes: 4799ac81e52a ("tls: Add rx inline crypto offload")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tls/tls_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 961b07d4d41c..b61b893e9204 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -874,7 +874,9 @@ int tls_set_device_offload_rx(struct sock *sk, struct tls_context *ctx) goto release_netdev; free_sw_resources: + up_read(&device_offload_lock); tls_sw_free_resources_rx(sk); + down_read(&device_offload_lock); release_ctx: ctx->priv_ctx_rx = NULL; release_netdev: |