Merge tag '6.5-rc-smb3-client-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / crypto / algif_hash.c

diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index 1a2d80c..0ab43e1 100644 (file)
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -76,13 +76,30 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg,
 
        lock_sock(sk);
        if (!continuing) {
-               if ((msg->msg_flags & MSG_MORE))
-                       hash_free_result(sk, ctx);
+               /* Discard a previous request that wasn't marked MSG_MORE. */
+               hash_free_result(sk, ctx);
+               if (!msg_data_left(msg))
+                       goto done; /* Zero-length; don't start new req */
                need_init = true;
+       } else if (!msg_data_left(msg)) {
+               /*
+                * No data - finalise the prev req if MSG_MORE so any error
+                * comes out here.
+                */
+               if (!(msg->msg_flags & MSG_MORE)) {
+                       err = hash_alloc_result(sk, ctx);
+                       if (err)
+                               goto unlock_free;
+                       ahash_request_set_crypt(&ctx->req, NULL,
+                                               ctx->result, 0);
+                       err = crypto_wait_req(crypto_ahash_final(&ctx->req),
+                                             &ctx->wait);
+                       if (err)
+                               goto unlock_free;
+               }
+               goto done_more;
        }
 
-       ctx->more = false;
-
        while (msg_data_left(msg)) {
                ctx->sgl.sgt.sgl = ctx->sgl.sgl;
                ctx->sgl.sgt.nents = 0;
@@ -93,15 +110,6 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg,
                if (npages == 0)
                        goto unlock_free;
 
-               if (npages > ARRAY_SIZE(ctx->sgl.sgl)) {
-                       err = -ENOMEM;
-                       ctx->sgl.sgt.sgl =
-                               kvmalloc(array_size(npages,
-                                                   sizeof(*ctx->sgl.sgt.sgl)),
-                                        GFP_KERNEL);
-                       if (!ctx->sgl.sgt.sgl)
-                               goto unlock_free;
-               }
                sg_init_table(ctx->sgl.sgl, npages);
 
                ctx->sgl.need_unpin = iov_iter_extract_will_pin(&msg->msg_iter);
@@ -150,7 +158,9 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg,
                af_alg_free_sg(&ctx->sgl);
        }
 
+done_more:
        ctx->more = msg->msg_flags & MSG_MORE;
+done:
        err = 0;
 unlock:
        release_sock(sk);
@@ -158,61 +168,11 @@ unlock:
 
 unlock_free:
        af_alg_free_sg(&ctx->sgl);
+       hash_free_result(sk, ctx);
+       ctx->more = false;
        goto unlock;
 }
 
-static ssize_t hash_sendpage(struct socket *sock, struct page *page,
-                            int offset, size_t size, int flags)
-{
-       struct sock *sk = sock->sk;
-       struct alg_sock *ask = alg_sk(sk);
-       struct hash_ctx *ctx = ask->private;
-       int err;
-
-       if (flags & MSG_SENDPAGE_NOTLAST)
-               flags |= MSG_MORE;
-
-       lock_sock(sk);
-       sg_init_table(ctx->sgl.sgl, 1);
-       sg_set_page(ctx->sgl.sgl, page, size, offset);
-
-       if (!(flags & MSG_MORE)) {
-               err = hash_alloc_result(sk, ctx);
-               if (err)
-                       goto unlock;
-       } else if (!ctx->more)
-               hash_free_result(sk, ctx);
-
-       ahash_request_set_crypt(&ctx->req, ctx->sgl.sgl, ctx->result, size);
-
-       if (!(flags & MSG_MORE)) {
-               if (ctx->more)
-                       err = crypto_ahash_finup(&ctx->req);
-               else
-                       err = crypto_ahash_digest(&ctx->req);
-       } else {
-               if (!ctx->more) {
-                       err = crypto_ahash_init(&ctx->req);
-                       err = crypto_wait_req(err, &ctx->wait);
-                       if (err)
-                               goto unlock;
-               }
-
-               err = crypto_ahash_update(&ctx->req);
-       }
-
-       err = crypto_wait_req(err, &ctx->wait);
-       if (err)
-               goto unlock;
-
-       ctx->more = flags & MSG_MORE;
-
-unlock:
-       release_sock(sk);
-
-       return err ?: size;
-}
-
 static int hash_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
                        int flags)
 {
@@ -328,7 +288,6 @@ static struct proto_ops algif_hash_ops = {
 
        .release        =       af_alg_release,
        .sendmsg        =       hash_sendmsg,
-       .sendpage       =       hash_sendpage,
        .recvmsg        =       hash_recvmsg,
        .accept         =       hash_accept,
 };
@@ -380,18 +339,6 @@ static int hash_sendmsg_nokey(struct socket *sock, struct msghdr *msg,
        return hash_sendmsg(sock, msg, size);
 }
 
-static ssize_t hash_sendpage_nokey(struct socket *sock, struct page *page,
-                                  int offset, size_t size, int flags)
-{
-       int err;
-
-       err = hash_check_key(sock);
-       if (err)
-               return err;
-
-       return hash_sendpage(sock, page, offset, size, flags);
-}
-
 static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg,
                              size_t ignored, int flags)
 {
@@ -430,7 +377,6 @@ static struct proto_ops algif_hash_ops_nokey = {
 
        .release        =       af_alg_release,
        .sendmsg        =       hash_sendmsg_nokey,
-       .sendpage       =       hash_sendpage_nokey,
        .recvmsg        =       hash_recvmsg_nokey,
        .accept         =       hash_accept_nokey,
 };