Commit 62ef81d5 authored Apr 19, 2019 by Jakub Kicinski Committed by David S. Miller Apr 20, 2019

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: 4799ac81 ("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>

parent 8c03557c

net/tls/tls_device.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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:

Admin message