2018-07-11 03:44:16

by Vakul Garg

Subject: [PATCH net-next][RESEND] net/tls: Use aead_request_alloc/free for request alloc/free

Instead of kzalloc/free for aead_request allocation and free, use
functions aead_request_alloc(), aead_request_free(). It ensures that
any sensitive crypto material held in crypto transforms is securely
erased from memory.

Signed-off-by: Vakul Garg <[email protected]>
---
net/tls/tls_sw.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 173d8b89072d..03d3eef1c17b 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -57,14 +57,11 @@ static int tls_do_decryption(struct sock *sk,
struct aead_request *aead_req;

int ret;
- unsigned int req_size = sizeof(struct aead_request) +
- crypto_aead_reqsize(ctx->aead_recv);

- aead_req = kzalloc(req_size, flags);
+ aead_req = aead_request_alloc(ctx->aead_recv, flags);
if (!aead_req)
return -ENOMEM;

- aead_request_set_tfm(aead_req, ctx->aead_recv);
aead_request_set_ad(aead_req, TLS_AAD_SPACE_SIZE);
aead_request_set_crypt(aead_req, sgin, sgout,
data_len + tls_ctx->rx.tag_size,
@@ -86,7 +83,7 @@ static int tls_do_decryption(struct sock *sk,
ctx->saved_data_ready(sk);

out:
- kfree(aead_req);
+ aead_request_free(aead_req);
return ret;
}

@@ -224,8 +221,7 @@ static int tls_push_record(struct sock *sk, int flags,
struct aead_request *req;
int rc;

- req = kzalloc(sizeof(struct aead_request) +
- crypto_aead_reqsize(ctx->aead_send), sk->sk_allocation);
+ req = aead_request_alloc(ctx->aead_send, sk->sk_allocation);
if (!req)
return -ENOMEM;

@@ -267,7 +263,7 @@ static int tls_push_record(struct sock *sk, int flags,

tls_advance_record_sn(sk, &tls_ctx->tx);
out_req:
- kfree(req);
+ aead_request_free(req);
return rc;
}

--
2.13.6

2018-07-12 14:39:47

by Dave Watson

Subject: Re: [PATCH net-next][RESEND] net/tls: Use aead_request_alloc/free for request alloc/free

On 07/11/18 02:32 PM, Vakul Garg wrote:
> Instead of kzalloc/free for aead_request allocation and free, use
> functions aead_request_alloc(), aead_request_free(). It ensures that
> any sensitive crypto material held in crypto transforms is securely
> erased from memory.
>
> Signed-off-by: Vakul Garg <[email protected]>

Acked-by: Dave Watson <[email protected]>

2018-07-12 21:47:49

by David Miller

Subject: Re: [PATCH net-next][RESEND] net/tls: Use aead_request_alloc/free for request alloc/free

From: Vakul Garg <[email protected]>
Date: Wed, 11 Jul 2018 14:32:20 +0530

> Instead of kzalloc/free for aead_request allocation and free, use
> functions aead_request_alloc(), aead_request_free(). It ensures that
> any sensitive crypto material held in crypto transforms is securely
> erased from memory.
>
> Signed-off-by: Vakul Garg <[email protected]>

Applied, thanks.