lkml.org 
[lkml]   [2023]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v2 36/48] algif: Remove hash_sendpage*()
    Date
    Remove hash_sendpage*()..

    Signed-off-by: David Howells <dhowells@redhat.com>
    cc: Herbert Xu <herbert@gondor.apana.org.au>
    cc: "David S. Miller" <davem@davemloft.net>
    cc: Eric Dumazet <edumazet@google.com>
    cc: Jakub Kicinski <kuba@kernel.org>
    cc: Paolo Abeni <pabeni@redhat.com>
    cc: Jens Axboe <axboe@kernel.dk>
    cc: Matthew Wilcox <willy@infradead.org>
    cc: linux-crypto@vger.kernel.org
    cc: netdev@vger.kernel.org
    ---
    crypto/algif_hash.c | 66 ---------------------------------------------
    1 file changed, 66 deletions(-)

    diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
    index b89c2c50cecc..dc6c45637b2d 100644
    --- a/crypto/algif_hash.c
    +++ b/crypto/algif_hash.c
    @@ -162,58 +162,6 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg,
    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)
    {
    @@ -318,7 +266,6 @@ static struct proto_ops algif_hash_ops = {

    .release = af_alg_release,
    .sendmsg = hash_sendmsg,
    - .sendpage = hash_sendpage,
    .recvmsg = hash_recvmsg,
    .accept = hash_accept,
    };
    @@ -370,18 +317,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)
    {
    @@ -420,7 +355,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,
    };
    \
     
     \ /
      Last update: 2023-03-29 16:24    [W:4.026 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site