Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Fixes: 84c61fe1a75b ("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>

authored by

Jakub Kicinski and committed by
Paolo Abeni
58689498 47888597

+11
+1
net/tls/tls.h
··· 188 188 void tls_strp_dev_exit(void); 189 189 190 190 void tls_strp_done(struct tls_strparser *strp); 191 + void __tls_strp_done(struct tls_strparser *strp); 191 192 void tls_strp_stop(struct tls_strparser *strp); 192 193 int tls_strp_init(struct tls_strparser *strp, struct sock *sk); 193 194 void tls_strp_data_ready(struct tls_strparser *strp);
+6
net/tls/tls_strp.c
··· 624 624 WARN_ON(!strp->stopped); 625 625 626 626 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 + { 627 633 tls_strp_anchor_free(strp); 628 634 } 629 635
+4
net/tls/tls_sw.c
··· 2624 2624 void tls_sw_free_resources_rx(struct sock *sk) 2625 2625 { 2626 2626 struct tls_context *tls_ctx = tls_get_ctx(sk); 2627 + struct tls_sw_context_rx *ctx; 2628 + 2629 + ctx = tls_sw_ctx_rx(tls_ctx); 2627 2630 2628 2631 tls_sw_release_resources_rx(sk); 2632 + __tls_strp_done(&ctx->strp); 2629 2633 tls_sw_free_ctx_rx(tls_ctx); 2630 2634 } 2631 2635