net: tls: fix strparser anchor skb leak on offload RX setup failure
Subsystems (3)
Jakub Kicinski
maintainerPATCH 1/1 net: tls: fix strparser anchor skb leak on offload RX setup failure
When tls_set_device_offload_rx() fails at tls_dev_add(), the error path calls tls_sw_free_resources_rx() to clean up the SW context that was initialized by tls_set_sw_offload(). This function calls tls_sw_release_resources_rx() (which stops the strparser via tls_strp_stop()) and tls_sw_free_ctx_rx() (which kfrees the context), but never frees the anchor skb that was allocated by alloc_skb(0) in tls_strp_init().
Note that tls_sw_free_resources_rx() is exclusively used for this "failed to start offload" code path, there's no other caller.
The leak did not exist before commit 84c61fe1a75b ("tls: rx: do not use the standard strparser"), because the standard strparser doesn't try to pre-allocate an skb.
The normal close path in tls_sk_proto_close() handles cleanup by calling tls_sw_strparser_done() (which calls tls_strp_done()) after dropping the socket lock, because tls_strp_done() does cancel_work_sync() and the strparser work handler takes the socket lock.
---
CC: [email protected]
CC: [email protected]
--- net/tls/tls.h | 1 + net/tls/tls_strp.c | 6 ++++++ net/tls/tls_sw.c | 4 ++++ 3 files changed, 11 insertions(+)
net/tls/tls.h +1 -0
@@ -188,6 +188,7 @@ int tls_strp_dev_init(void);void tls_strp_dev_exit (void );void tls_strp_done (struct tls_strparser *strp); +void __tls_strp_done (struct tls_strparser *strp);void tls_strp_stop (struct tls_strparser *strp);int tls_strp_init (struct tls_strparser *strp,struct sock *sk);void tls_strp_data_ready (struct tls_strparser *strp);
net/tls/tls_strp.c +6 -0
@@ -624,6 +624,12 @@ void tls_strp_done(struct tls_strparser *strp)WARN_ON (!strp->stopped);cancel_work_sync (&strp->work); +__tls_strp_done (strp); +} + +/* For setup error paths where the strparser was initialized but never armed. */ +void __tls_strp_done (struct tls_strparser *strp) +{tls_strp_anchor_free (strp); }
net/tls/tls_sw.c +4 -0
@@ -2624,8 +2624,12 @@ void tls_sw_free_ctx_rx(struct tls_context *tls_ctx)void tls_sw_free_resources_rx (struct sock *sk) {struct tls_context *tls_ctx =tls_get_ctx (sk); +struct tls_sw_context_rx *ctx; + + ctx =tls_sw_ctx_rx (tls_ctx);tls_sw_release_resources_rx (sk); +__tls_strp_done (&ctx->strp);tls_sw_free_ctx_rx (tls_ctx); }
Signature · 1 line
2.54.0
Quoted 67 lines · Jakub Kicinski
When
tls_set_device_offload_rx()fails attls_dev_add(), the error path callstls_sw_free_resources_rx()to clean up the SW context that was initialized bytls_set_sw_offload(). This function callstls_sw_release_resources_rx()(which stops the strparser viatls_strp_stop()) andtls_sw_free_ctx_rx()(which kfrees the context), but never frees the anchor skb that was allocated byalloc_skb(0)intls_strp_init().Note that
tls_sw_free_resources_rx()is exclusively used for this "failed to start offload" code path, there's no other caller.The leak did not exist before commit
84c61fe1a75b("tls: rx: do not use the standard strparser"), because the standard strparser doesn't try to pre-allocate an skb.The normal close path in
tls_sk_proto_close()handles cleanup by callingtls_sw_strparser_done()(which callstls_strp_done()) after dropping the socket lock, becausetls_strp_done()doescancel_work_sync()and the strparser work handler takes the socket lock.Fixes 84c61fe1a75b ("tls: rx: do not use the standard strparser")Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]--- net/tls/tls.h | 1 + net/tls/tls_strp.c | 6 ++++++ net/tls/tls_sw.c | 4 ++++ 3 files changed, 11 insertions(+)net/tls/tls.h +1
-0@@ -188,6 +188,7 @@ int tls_strp_dev_init(void);void tls_strp_dev_exit (void );void tls_strp_done (struct tls_strparser *strp); +void __tls_strp_done (struct tls_strparser *strp);void tls_strp_stop (struct tls_strparser *strp);int tls_strp_init (struct tls_strparser *strp,struct sock *sk);void tls_strp_data_ready (struct tls_strparser *strp);net/tls/tls_strp.c +6
-0@@ -624,6 +624,12 @@ void tls_strp_done(struct tls_strparser *strp)WARN_ON (!strp->stopped);cancel_work_sync (&strp->work); +__tls_strp_done (strp); +} + +/* For setup error paths where the strparser was initialized but never armed. */ +void __tls_strp_done (struct tls_strparser *strp) +{tls_strp_anchor_free (strp); }net/tls/tls_sw.c +0
-0@@ -2624,8 +2624,12 @@ void tls_sw_free_ctx_rx(struct tls_context *tls_ctx)void tls_sw_free_resources_rx (struct sock *sk) {
net/tls/tls_sw.c void tls_sw_free_ctx_rx(struct tls_context *tls_ctx) · line 2635
Quoted 10 lines
net/tls/tls_sw.c +4
-0struct tls_context *tls_ctx =tls_get_ctx (sk); +struct tls_sw_context_rx *ctx; + + ctx =tls_sw_ctx_rx (tls_ctx);tls_sw_release_resources_rx (sk); +__tls_strp_done (&ctx->strp);tls_sw_free_ctx_rx (tls_ctx); }
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Tue, 28 Apr 2026 16:15:59 -0700 you wrote:
When
tls_set_device_offload_rx()fails attls_dev_add(), the error path callstls_sw_free_resources_rx()to clean up the SW context that was initialized bytls_set_sw_offload(). This function callstls_sw_release_resources_rx()(which stops the strparser viatls_strp_stop()) andtls_sw_free_ctx_rx()(which kfrees the context), but never frees the anchor skb that was allocated byalloc_skb(0)intls_strp_init().[...]
Here is the summary with links:
- [net] net: tls: fix strparser anchor skb leak on offload RX setup failure
https://git.kernel.org/netdev/net/c/58689498ca33
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html