iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/tls: Use aead_request_alloc/free for request alloc/free

Browse Source 
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 <vakul.garg@nxp.com>
Acked-by: Dave Watson <davejwatson@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vakul Garg 2018-07-11 14:32:20 +05:30 committed by David S. Miller
parent cba54f9cf4
commit d2bdd26812
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/tls/tls_sw.c
View File

@ -57,14 +57,11 @@ static int tls_do_decryption(struct sock *sk,
struct aead_request *aead_req; struct aead_request *aead_req;
int ret; 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) if (!aead_req)
return -ENOMEM; return -ENOMEM;
aead_request_set_tfm(aead_req, ctx->aead_recv);
aead_request_set_ad(aead_req, TLS_AAD_SPACE_SIZE); aead_request_set_ad(aead_req, TLS_AAD_SPACE_SIZE);
aead_request_set_crypt(aead_req, sgin, sgout, aead_request_set_crypt(aead_req, sgin, sgout,
data_len + tls_ctx->rx.tag_size, data_len + tls_ctx->rx.tag_size,
@ -86,7 +83,7 @@ static int tls_do_decryption(struct sock *sk,
ctx->saved_data_ready(sk); ctx->saved_data_ready(sk);
out: out:
kfree(aead_req); aead_request_free(aead_req);
return ret; return ret;
} }
@ -224,8 +221,7 @@ static int tls_push_record(struct sock *sk, int flags,
struct aead_request *req; struct aead_request *req;
int rc; int rc;
req = kzalloc(sizeof(struct aead_request) + req = aead_request_alloc(ctx->aead_send, sk->sk_allocation);
crypto_aead_reqsize(ctx->aead_send), sk->sk_allocation);
if (!req) if (!req)
return -ENOMEM; return -ENOMEM;
@ -267,7 +263,7 @@ static int tls_push_record(struct sock *sk, int flags,
tls_advance_record_sn(sk, &tls_ctx->tx); tls_advance_record_sn(sk, &tls_ctx->tx);
out_req: out_req:
kfree(req); aead_request_free(req);
return rc; return rc;
} }