From: Jakub Kicinski Date: Fri, 19 Apr 2019 23:51:38 +0000 (-0700) Subject: net/tls: avoid potential deadlock in tls_set_device_offload_rx() X-Git-Tag: v5.1-rc7~20^2~15 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=62ef81d5632634d5e310ed25b9b940b2b6612b46;p=users%2Fdwmw2%2Flinux.git net/tls: avoid potential deadlock in tls_set_device_offload_rx() 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 Reviewed-by: Dirk van der Merwe Signed-off-by: David S. Miller --- diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index 9f3bdbc1e5934..1b5f55cac613d 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -904,7 +904,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: