On Sat, Jun 10, 2017 at 07:59:25PM +0200, Stephan Müller wrote:
>
> -static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg,
> - int flags)
> +static int skcipher_recvmsg(struct socket *sock, struct msghdr *msg,
> + size_t ignored, int flags)
> {
> struct sock *sk = sock->sk;
> - struct alg_sock *ask = alg_sk(sk);
> - struct sock *psk = ask->parent;
> - struct alg_sock *pask = alg_sk(psk);
> - struct skcipher_ctx *ctx = ask->private;
> - struct skcipher_tfm *skc = pask->private;
> - struct crypto_skcipher *tfm = skc->skcipher;
> - unsigned bs = crypto_skcipher_blocksize(tfm);
> - struct skcipher_sg_list *sgl;
> - struct scatterlist *sg;
> - int err = -EAGAIN;
> - int used;
> - long copied = 0;
> + int ret = 0;
>
> lock_sock(sk);
> while (msg_data_left(msg)) {
> - if (!ctx->used) {
> - err = skcipher_wait_for_data(sk, flags);
> - if (err)
> - goto unlock;
> + int err = _skcipher_recvmsg(sock, msg, ignored, flags);
> +
> + /*
> + * This error covers -EIOCBQUEUED which implies that we can
> + * only handle one AIO request. If the caller wants to have
> + * multiple AIO requests in parallel, he must make multiple
> + * separate AIO calls.
> + */
> + if (err < 0) {
> + ret = err;
> + goto out;
This looks like a semantic change. The previous code would return
the number of bytes already successfully processed in case of a
subsequent error. With your new code you will always return the
error.
> @@ -724,10 +737,9 @@ static unsigned int skcipher_poll(struct file *file, struct socket *sock,
> struct sock *sk = sock->sk;
> struct alg_sock *ask = alg_sk(sk);
> struct skcipher_ctx *ctx = ask->private;
> - unsigned int mask;
> + unsigned int mask = 0;
>
> sock_poll_wait(file, sk_sleep(sk), wait);
> - mask = 0;
>
> if (ctx->used)
> mask |= POLLIN | POLLRDNORM;
Please remove this hunk as it has nothing to do with this patch.
Thanks,
--
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
