diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-04-19 16:52:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-02 09:59:01 +0200 |
| commit | 53db652324283624970355fab09c3bc4190c57e6 (patch) | |
| tree | e4a6190c051e75c1d83057d256ac05acabcf3d6a | |
| parent | d3bdd359fa53c1d577bc96677474c43bfb9090bd (diff) | |
| download | linux-stable-53db652324283624970355fab09c3bc4190c57e6.tar.gz linux-stable-53db652324283624970355fab09c3bc4190c57e6.tar.bz2 linux-stable-53db652324283624970355fab09c3bc4190c57e6.zip | |
net/tls: don't leak IV and record seq when offload fails
[ Upstream commit 12c7686111326148b4b5db189130522a4ad1be4a ]
When device refuses the offload in tls_set_device_offload_rx()
it calls tls_sw_free_resources_rx() to clean up software context
state.
Unfortunately, tls_sw_free_resources_rx() does not free all
the state tls_set_sw_offload() allocated - it leaks IV and
sequence number buffers. All other code paths which lead to
tls_sw_release_resources_rx() (which tls_sw_free_resources_rx()
calls) free those right before the call.
Avoid the leak by moving freeing of iv and rec_seq into
tls_sw_release_resources_rx().
Fixes: 4799ac81e52a ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/tls/tls_device.c | 2 | ||||
| -rw-r--r-- | net/tls/tls_main.c | 5 | ||||
| -rw-r--r-- | net/tls/tls_sw.c | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index b61b893e9204..c9588b682db4 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -911,8 +911,6 @@ void tls_device_offload_cleanup_rx(struct sock *sk) } out: up_read(&device_offload_lock); - kfree(tls_ctx->rx.rec_seq); - kfree(tls_ctx->rx.iv); tls_sw_release_resources_rx(sk); } diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index a091c03abcb2..25b3fb585777 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -290,11 +290,8 @@ static void tls_sk_proto_close(struct sock *sk, long timeout) tls_sw_free_resources_tx(sk); } - if (ctx->rx_conf == TLS_SW) { - kfree(ctx->rx.rec_seq); - kfree(ctx->rx.iv); + if (ctx->rx_conf == TLS_SW) tls_sw_free_resources_rx(sk); - } #ifdef CONFIG_TLS_DEVICE if (ctx->rx_conf == TLS_HW) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index b9c6ecfbcfea..6848a8196711 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1118,6 +1118,9 @@ void tls_sw_release_resources_rx(struct sock *sk) struct tls_context *tls_ctx = tls_get_ctx(sk); struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx); + kfree(tls_ctx->rx.rec_seq); + kfree(tls_ctx->rx.iv); + if (ctx->aead_recv) { kfree_skb(ctx->recv_pkt); ctx->recv_pkt = NULL; |