p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tls: fix sw_ctx leak 

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.

Fixes: 3c4d755915 ('tls: kernel TLS support')
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sabrina Dubroca 2018-01-16 16:04:26 +01:00 committed by David S. Miller
parent 6ab6dd9e7f
commit cf6d43ef66
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/tls/tls_sw.c
View File

@ -681,18 +681,17 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx)
} }
default: default:
rc = -EINVAL; rc = -EINVAL;
goto out; goto free_priv;
} }
ctx->prepend_size = TLS_HEADER_SIZE + nonce_size; ctx->prepend_size = TLS_HEADER_SIZE + nonce_size;
ctx->tag_size = tag_size; ctx->tag_size = tag_size;
ctx->overhead_size = ctx->prepend_size + ctx->tag_size; ctx->overhead_size = ctx->prepend_size + ctx->tag_size;
ctx->iv_size = iv_size; ctx->iv_size = iv_size;
ctx->iv = kmalloc(iv_size + TLS_CIPHER_AES_GCM_128_SALT_SIZE, ctx->iv = kmalloc(iv_size + TLS_CIPHER_AES_GCM_128_SALT_SIZE, GFP_KERNEL);
GFP_KERNEL);
if (!ctx->iv) { if (!ctx->iv) {
rc = -ENOMEM; rc = -ENOMEM;
goto out; goto free_priv;
} }
memcpy(ctx->iv, gcm_128_info->salt, TLS_CIPHER_AES_GCM_128_SALT_SIZE); 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); memcpy(ctx->iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE, iv, iv_size);
@ -740,7 +739,7 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx)
rc = crypto_aead_setauthsize(sw_ctx->aead_send, ctx->tag_size); rc = crypto_aead_setauthsize(sw_ctx->aead_send, ctx->tag_size);
if (!rc) if (!rc)
goto out; return 0;
free_aead: free_aead:
crypto_free_aead(sw_ctx->aead_send); crypto_free_aead(sw_ctx->aead_send);
@ -751,6 +750,9 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx)
free_iv: free_iv:
kfree(ctx->iv); kfree(ctx->iv);
ctx->iv = NULL; ctx->iv = NULL;
free_priv:
kfree(ctx->priv_ctx);
ctx->priv_ctx = NULL;
out: out:
return rc; return rc;
} }