Commit 32eb67b9 authored by Dave Watson's avatar Dave Watson Committed by David S. Miller

net: tls: Save iv in tls_rec for async crypto requests

aead_request_set_crypt takes an iv pointer, and we change the iv
soon after setting it.  Some async crypto algorithms don't save the iv,
so we need to save it in the tls_rec for async requests.

Found by hardcoding x64 aesni to use async crypto manager (to test the async
codepath), however I don't think this combination can happen in the wild.
Presumably other hardware offloads will need this fix, but there have been
no user reports.

Fixes: a42055e8 ("Add support for async encryption of records...")
Signed-off-by: default avatarDave Watson <davejwatson@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b46a0bf7
...@@ -120,6 +120,8 @@ struct tls_rec { ...@@ -120,6 +120,8 @@ struct tls_rec {
struct scatterlist sg_aead_out[2]; struct scatterlist sg_aead_out[2];
char aad_space[TLS_AAD_SPACE_SIZE]; char aad_space[TLS_AAD_SPACE_SIZE];
u8 iv_data[TLS_CIPHER_AES_GCM_128_IV_SIZE +
TLS_CIPHER_AES_GCM_128_SALT_SIZE];
struct aead_request aead_req; struct aead_request aead_req;
u8 aead_req_ctx[]; u8 aead_req_ctx[];
}; };
......
...@@ -439,6 +439,8 @@ static int tls_do_encryption(struct sock *sk, ...@@ -439,6 +439,8 @@ static int tls_do_encryption(struct sock *sk,
struct scatterlist *sge = sk_msg_elem(msg_en, start); struct scatterlist *sge = sk_msg_elem(msg_en, start);
int rc; int rc;
memcpy(rec->iv_data, tls_ctx->tx.iv, sizeof(rec->iv_data));
sge->offset += tls_ctx->tx.prepend_size; sge->offset += tls_ctx->tx.prepend_size;
sge->length -= tls_ctx->tx.prepend_size; sge->length -= tls_ctx->tx.prepend_size;
...@@ -448,7 +450,7 @@ static int tls_do_encryption(struct sock *sk, ...@@ -448,7 +450,7 @@ static int tls_do_encryption(struct sock *sk,
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, rec->sg_aead_in, aead_request_set_crypt(aead_req, rec->sg_aead_in,
rec->sg_aead_out, rec->sg_aead_out,
data_len, tls_ctx->tx.iv); data_len, rec->iv_data);
aead_request_set_callback(aead_req, CRYPTO_TFM_REQ_MAY_BACKLOG, aead_request_set_callback(aead_req, CRYPTO_TFM_REQ_MAY_BACKLOG,
tls_encrypt_done, sk); tls_encrypt_done, sk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment