Patch "tls: fix sw_ctx leak" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
tls: fix sw_ctx leak
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tls-fix-sw_ctx-leak.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sun Jan 28 17:35:08 CET 2018
From: Sabrina Dubroca <[email protected]>
Date: Tue, 16 Jan 2018 16:04:26 +0100
Subject: tls: fix sw_ctx leak
From: Sabrina Dubroca <[email protected]>
[ Upstream commit cf6d43ef66f416282121f436ce1bee9a25199d52 ]
During setsockopt(SOL_TCP, TLS_TX), if initialization of the software context fails in tls_set_sw_offload(), we leak sw_ctx. We also don't reassign ctx->priv_ctx to NULL, so we can't even do another attempt to set it up on the same socket, as it will fail with -EEXIST.
--- net/tls/tls_sw.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
net/tls/tls_sw.c +7 -5
@@ -697,18 +697,17 @@ int tls_set_sw_offload(struct sock *sk, }default : rc = -EINVAL ; - goto out; + goto free_priv; } ctx->prepend_size =TLS_HEADER_SIZE + nonce_size; ctx->tag_size = tag_size; ctx->overhead_size = ctx->prepend_size + ctx->tag_size; ctx->iv_size = iv_size; - ctx->iv =kmalloc (iv_size +TLS_CIPHER_AES_GCM_128_SALT_SIZE , -GFP_KERNEL ); + ctx->iv =kmalloc (iv_size +TLS_CIPHER_AES_GCM_128_SALT_SIZE ,GFP_KERNEL );if (!ctx->iv) { rc = -ENOMEM ; - goto out; + goto free_priv; }memcpy (ctx->iv, gcm_128_info->salt,TLS_CIPHER_AES_GCM_128_SALT_SIZE );memcpy (ctx->iv +TLS_CIPHER_AES_GCM_128_SALT_SIZE , iv, iv_size);
@@ -756,7 +755,7 @@ int tls_set_sw_offload(struct sock *sk, rc =crypto_aead_setauthsize (sw_ctx->aead_send, ctx->tag_size);if (!rc) - goto out; +return 0 ; free_aead:crypto_free_aead (sw_ctx->aead_send);
@@ -767,6 +766,9 @@ free_rec_seq: free_iv:kfree (ctx->iv); ctx->iv =NULL ; +free_priv: +kfree (ctx->priv_ctx); + ctx->priv_ctx =NULL ; out:return rc; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/tls-reset-crypto_info-when-do_tls_setsockopt_tx-fails.patch queue-4.14/tls-return-ebusy-if-crypto_info-is-already-set.patch queue-4.14/tls-fix-sw_ctx-leak.patch