diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-29 21:18:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-29 21:18:54 -0800 |
| commit | eaf2a47f40f01ef793d2fc50cf03d199846013ca (patch) | |
| tree | 0646365688ca76306aaa17ce7983944f5ec411b0 /net/tls | |
| parent | c829f5f52db9bae0379b98fca2645f6ca9b0fb1e (diff) | |
| parent | 62967898789dc1f09a06e59fa85ae2c5ca4dc2da (diff) | |
| download | linux-eaf2a47f40f01ef793d2fc50cf03d199846013ca.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/tls')
| -rw-r--r-- | net/tls/tls_sw.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 86b9527c4826..3f2a6af27e62 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -447,6 +447,8 @@ static int tls_do_encryption(struct sock *sk, struct scatterlist *sge = sk_msg_elem(msg_en, start); int rc; + memcpy(rec->iv_data, tls_ctx->tx.iv, sizeof(rec->iv_data)); + sge->offset += tls_ctx->tx.prepend_size; sge->length -= tls_ctx->tx.prepend_size; @@ -456,7 +458,7 @@ static int tls_do_encryption(struct sock *sk, aead_request_set_ad(aead_req, TLS_AAD_SPACE_SIZE); aead_request_set_crypt(aead_req, rec->sg_aead_in, 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, tls_encrypt_done, sk); @@ -1901,7 +1903,9 @@ void tls_sw_free_resources_tx(struct sock *sk) if (atomic_read(&ctx->encrypt_pending)) crypto_wait_req(-EINPROGRESS, &ctx->async_wait); + release_sock(sk); cancel_delayed_work_sync(&ctx->tx_work.work); + lock_sock(sk); /* Tx whatever records we can transmit and abandon the rest */ tls_tx_records(sk, -1); |