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 10:02:57 +0200 |
| commit | bcf0c1f4d56426ee7d784d9a0c958bceaa5ed24d (patch) | |
| tree | 13722b6d39ec990f96744b77b0bab53f0b3edd90 | |
| parent | 2adb99038ae421985daa37379521c863462859f9 (diff) | |
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 b81b201304f7..5f1d937c4be9 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -921,8 +921,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 96dbac91ac6e..ce5dd79365a7 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -304,11 +304,8 @@ static void tls_sk_proto_close(struct sock *sk, long timeout) #endif } - 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 d2d4f7c0d4be..839a0a0b5dfa 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1830,6 +1830,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; |