On Wed, 7 Feb 2018 13:48:32 +0100
Stephan Mueller <smueller@xxxxxxxxxx> wrote:
> Am Mittwoch, 7. Februar 2018, 08:44:04 CET schrieb Stephan Müller:
>
> Hi,
>
>
> > diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
> > index 3970ad7f6fd0..da010405eea0 100644
> > --- a/crypto/algif_aead.c
> > +++ b/crypto/algif_aead.c
> > @@ -66,13 +66,22 @@ static int aead_sendmsg(struct socket *sock, struct
> > msghdr *msg, size_t size) {
> > struct sock *sk = sock->sk;
> > struct alg_sock *ask = alg_sk(sk);
> > + struct af_alg_ctx *ctx = ask->private;
> > struct sock *psk = ask->parent;
> > struct alg_sock *pask = alg_sk(psk);
> > struct aead_tfm *aeadc = pask->private;
> > - struct crypto_aead *tfm = aeadc->aead;
> > - unsigned int ivsize = crypto_aead_ivsize(tfm);
> > + struct crypto_aead *aead = aeadc->aead;
> > + struct crypto_tfm *tfm = crypto_aead_tfm(aead);
> > + unsigned int ivsize = crypto_aead_ivsize(aead);
> > + int ret = af_alg_sendmsg(sock, msg, size, ivsize);
> > +
> > + if (ret < 0)
> > + return ret;
> >
> > - return af_alg_sendmsg(sock, msg, size, ivsize);
> > + if (ctx->iiv == ALG_IIV_USE)
>
> This should be ALG_IIV_DISABLE of course.
You say that, but my initial reading was that the core
was requesting that the driver do things in parallel
irrespective of whether the driver thought it was safe.
So I would think this was correct.
Definitely needs some documentation or a clearer name.
>
> > + tfm->crt_flags |= CRYPTO_TFM_REQ_PARALLEL;
> > +
> > + return ret;
> > }
> >
> > static int crypto_aead_copy_sgl(struct crypto_skcipher *null_tfm,
> > diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
> > index aee602a3ec24..225546666cf7 100644
> > --- a/crypto/algif_skcipher.c
> > +++ b/crypto/algif_skcipher.c
> > @@ -43,12 +43,21 @@ static int skcipher_sendmsg(struct socket *sock, struct
> > msghdr *msg, {
> > struct sock *sk = sock->sk;
> > struct alg_sock *ask = alg_sk(sk);
> > + struct af_alg_ctx *ctx = ask->private;
> > struct sock *psk = ask->parent;
> > struct alg_sock *pask = alg_sk(psk);
> > - struct crypto_skcipher *tfm = pask->private;
> > - unsigned ivsize = crypto_skcipher_ivsize(tfm);
> > + struct crypto_skcipher *skc = pask->private;
> > + struct crypto_tfm *tfm = crypto_skcipher_tfm(skc);
> > + unsigned int ivsize = crypto_skcipher_ivsize(skc);
> > + int ret = af_alg_sendmsg(sock, msg, size, ivsize);
> > +
> > + if (ret < 0)
> > + return ret;
> >
> > - return af_alg_sendmsg(sock, msg, size, ivsize);
> > + if (ctx->iiv == ALG_IIV_USE)
>
> Dto.
>
> I will wait for some more comments before sending a new patch.
>
> Ciao
> Stephan
>
>
