Skip to content

Commit 3c405df

Browse files
kuba-moogregkh
authored andcommitted
net: tls: fix strparser anchor skb leak on offload RX setup failure
[ Upstream commit 5868949 ] 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 84c61fe ("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. Fixes: 84c61fe ("tls: rx: do not use the standard strparser") Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> Link: https://patch.msgid.link/20260428231559.1358502-1-kuba@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 4c2ac52 commit 3c405df

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

net/tls/tls.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ int tls_strp_dev_init(void);
186186
void tls_strp_dev_exit(void);
187187

188188
void tls_strp_done(struct tls_strparser *strp);
189+
void __tls_strp_done(struct tls_strparser *strp);
189190
void tls_strp_stop(struct tls_strparser *strp);
190191
int tls_strp_init(struct tls_strparser *strp, struct sock *sk);
191192
void tls_strp_data_ready(struct tls_strparser *strp);

net/tls/tls_strp.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,12 @@ void tls_strp_done(struct tls_strparser *strp)
624624
WARN_ON(!strp->stopped);
625625

626626
cancel_work_sync(&strp->work);
627+
__tls_strp_done(strp);
628+
}
629+
630+
/* For setup error paths where the strparser was initialized but never armed. */
631+
void __tls_strp_done(struct tls_strparser *strp)
632+
{
627633
tls_strp_anchor_free(strp);
628634
}
629635

net/tls/tls_sw.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,8 +2591,12 @@ void tls_sw_free_ctx_rx(struct tls_context *tls_ctx)
25912591
void tls_sw_free_resources_rx(struct sock *sk)
25922592
{
25932593
struct tls_context *tls_ctx = tls_get_ctx(sk);
2594+
struct tls_sw_context_rx *ctx;
2595+
2596+
ctx = tls_sw_ctx_rx(tls_ctx);
25942597

25952598
tls_sw_release_resources_rx(sk);
2599+
__tls_strp_done(&ctx->strp);
25962600
tls_sw_free_ctx_rx(tls_ctx);
25972601
}
25982602

0 commit comments

Comments
 (0)