On Thu, Jun 06, 2019 at 08:42:46AM +0200, Ard Biesheuvel wrote:
> On Thu, 6 Jun 2019 at 08:37, Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote:
> >
> > On Thu, May 30, 2019 at 04:31:09PM +0200, Ard Biesheuvel wrote:
> > >
> > > This might work:
> > >
> > > diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
> > > index c0ece44f303b..3d313d2a279a 100644
> > > --- a/drivers/crypto/caam/caamalg.c
> > > +++ b/drivers/crypto/caam/caamalg.c
> > > @@ -1661,7 +1661,8 @@ static int aead_decrypt(struct aead_request *req)
> > > * allocate and map the skcipher extended descriptor for skcipher
> > > */
> > > static struct skcipher_edesc *skcipher_edesc_alloc(struct
> > > skcipher_request *req,
> > > - int desc_bytes)
> > > + int desc_bytes,
> > > + u8 const *input_iv)
> > > {
> > > struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
> > > struct caam_ctx *ctx = crypto_skcipher_ctx(skcipher);
> > > @@ -1745,7 +1746,7 @@ static struct skcipher_edesc
> > > *skcipher_edesc_alloc(struct skcipher_request *req,
> > > /* Make sure IV is located in a DMAable area */
> > > if (ivsize) {
> > > iv = (u8 *)edesc->hw_desc + desc_bytes + sec4_sg_bytes;
> > > - memcpy(iv, req->iv, ivsize);
> > > + memcpy(iv, input_iv, ivsize);
> > >
> > > iv_dma = dma_map_single(jrdev, iv, ivsize, DMA_TO_DEVICE);
> > > if (dma_mapping_error(jrdev, iv_dma)) {
> >
> > Hi Ard:
> >
> > I presume you will be submitting this patch at some point? When
> > you do please base it on top of your other one which I'm about to
> > merge.
>
> I'm not sure I follow. Do you want a better fix for the CBC output IV
> going forward? Or is this about other modes?
You sent me a patch to fix CTR mode:
https://patchwork.kernel.org/patch/10969747/
But your suggested fix for CBC mode itself where we need to do the
copy (as seen quoted above) hasn't been submitted.
Cheers,
--
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
