net/tls: Fix race in TLS device down flow
Subsystems (3)
PATCH 1/1 net/tls: Fix race in TLS device down flow
Socket destruction flow and tls_device_down function sync against each other using tls_device_lock and the context refcount, to guarantee the device resources are freed via tls_dev_del() by the end of tls_device_down.
In the following unfortunate flow, this won't happen:
- refcount is decreased to zero in tls_device_sk_destruct.
- tls_device_down starts, skips the context as refcount is zero, going all the way until it flushes the gc work, and returns without freeing the device resources.
- only then, tls_device_queue_ctx_destruction is called, queues the gc work and frees the context's device resources.
Solve it by decreasing the refcount in the socket's destruction flow under the tls_device_lock, for perfect synchronization. This does not slow down the common likely destructor flow, in which both the refcount is decreased and the spinlock is acquired, anyway.
--- net/tls/tls_device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/tls/tls_device.c +5 -3
@@ -97,13 +97,16 @@ static void tls_device_queue_ctx_destruction(struct tls_context *ctx)unsigned long flags;spin_lock_irqsave (&tls_device_lock, flags); +if (unlikely (!refcount_dec_and_test (&ctx->refcount))) + goto unlock; +list_move_tail (&ctx->list, &tls_device_gc_list);/* schedule_work inside the spinlock * to make sure tls_device_down waits for that work. */ schedule_work (&tls_device_gc_work); - +unlock:spin_unlock_irqrestore (&tls_device_lock, flags); }
@@ -194,8 +197,7 @@ void tls_device_sk_destruct(struct sock *sk)clean_acked_data_disable (inet_csk (sk)); } -if (refcount_dec_and_test (&tls_ctx->refcount)) -tls_device_queue_ctx_destruction (tls_ctx); +tls_device_queue_ctx_destruction (tls_ctx); }EXPORT_SYMBOL_GPL (tls_device_sk_destruct);
Signature · 1 line
2.21.0
Quoted 13 lines · On Fri, 15 Jul 2022 11:42:16 +0300 Tariq Toukan wrote:
Socket destruction flow and
tls_device_downfunction sync against each other usingtls_device_lockand the context refcount, to guarantee the device resources are freed viatls_dev_del()by the end oftls_device_down.In the following unfortunate flow, this won't happen:
- refcount is decreased to zero intls_device_sk_destruct.
-tls_device_downstarts, skips the context as refcount is zero, going all the way until it flushes the gc work, and returns without freeing the device resources.
- only then,tls_device_queue_ctx_destructionis called, queues the gc work and frees the context's device resources.
Quoted 8 lines
Solve it by decreasing the refcount in the socket's destruction flow under the
tls_device_lock, for perfect synchronization. This does not slow down the common likely destructor flow, in which both the refcount is decreased and the spinlock is acquired, anyway.Fixes e8f69799810c ("net/tls: Add generic NIC offload infrastructure")Reviewed-by Maxim Mikityanskiy <[email protected]>Signed-off-by Tariq Toukan <[email protected]>
Oh, so it was already racy? Sad this has missed the PR, another delay for your -next patches :S
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:
Quoted 13 lines · On Fri, 15 Jul 2022 11:42:16 +0300 you wrote:
Socket destruction flow and
tls_device_downfunction sync against each other usingtls_device_lockand the context refcount, to guarantee the device resources are freed viatls_dev_del()by the end oftls_device_down.In the following unfortunate flow, this won't happen:
- refcount is decreased to zero intls_device_sk_destruct.
-tls_device_downstarts, skips the context as refcount is zero, going all the way until it flushes the gc work, and returns without freeing the device resources.
- only then,tls_device_queue_ctx_destructionis called, queues the gc work and frees the context's device resources.
Quoted 1 line
[...]
Here is the summary with links:
- [net] net/tls: Fix race in TLS device down flow
https://git.kernel.org/netdev/net/c/f08d8c1bb97c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html