1 files changed, 13 insertions, 13 deletions

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 34895b7c132d..2945a3bd538c 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -191,18 +191,12 @@ static void tls_free_both_sg(struct sock *sk)
 }
 
 static int tls_do_encryption(struct tls_context *tls_ctx,
-                             struct tls_sw_context_tx *ctx, size_t data_len,
-                             gfp_t flags)
+                             struct tls_sw_context_tx *ctx,
+                             struct aead_request *aead_req,
+                             size_t data_len)
 {
-        unsigned int req_size = sizeof(struct aead_request) +
-                crypto_aead_reqsize(ctx->aead_send);
-        struct aead_request *aead_req;
         int rc;
 
-        aead_req = kzalloc(req_size, flags);
-        if (!aead_req)
-                return -ENOMEM;
-
         ctx->sg_encrypted_data[0].offset += tls_ctx->tx.prepend_size;
         ctx->sg_encrypted_data[0].length -= tls_ctx->tx.prepend_size;
 
@@ -219,7 +213,6 @@ static int tls_do_encryption(struct tls_context *tls_ctx,
         ctx->sg_encrypted_data[0].offset -= tls_ctx->tx.prepend_size;
         ctx->sg_encrypted_data[0].length += tls_ctx->tx.prepend_size;
 
-        kfree(aead_req);
         return rc;
 }
 
@@ -228,8 +221,14 @@ static int tls_push_record(struct sock *sk, int flags,
 {
         struct tls_context *tls_ctx = tls_get_ctx(sk);
         struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx);
+        struct aead_request *req;
         int rc;
 
+        req = kzalloc(sizeof(struct aead_request) +
+                      crypto_aead_reqsize(ctx->aead_send), sk->sk_allocation);
+        if (!req)
+                return -ENOMEM;
+
         sg_mark_end(ctx->sg_plaintext_data + ctx->sg_plaintext_num_elem - 1);
         sg_mark_end(ctx->sg_encrypted_data + ctx->sg_encrypted_num_elem - 1);
 
@@ -245,15 +244,14 @@ static int tls_push_record(struct sock *sk, int flags,
         tls_ctx->pending_open_record_frags = 0;
         set_bit(TLS_PENDING_CLOSED_RECORD, &tls_ctx->flags);
 
-        rc = tls_do_encryption(tls_ctx, ctx, ctx->sg_plaintext_size,
-                               sk->sk_allocation);
+        rc = tls_do_encryption(tls_ctx, ctx, req, ctx->sg_plaintext_size);
         if (rc < 0) {
                 /* If we are called from write_space and
                  * we fail, we need to set this SOCK_NOSPACE
                  * to trigger another write_space in the future.
                  */
                 set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
-                return rc;
+                goto out_req;
         }
 
         free_sg(sk, ctx->sg_plaintext_data, &ctx->sg_plaintext_num_elem,
@@ -268,6 +266,8 @@ static int tls_push_record(struct sock *sk, int flags,
                 tls_err_abort(sk, EBADMSG);
 
         tls_advance_record_sn(sk, &tls_ctx->tx);
+out_req:
+        kfree(req);
         return rc;
 }