Re: [PATCH] crypto: x86/polyval - Fix crashes when keys are not 16-byte aligned

Eric Biggers
2022-10-18T00:16:58Z

On Mon, Oct 17, 2022 at 04:38:25PM -0700, Nathan Huckleberry wrote:
> On Mon, Oct 17, 2022 at 4:02 PM Eric Biggers <ebiggers@kernel.org> wrote:
> >
> > On Mon, Oct 17, 2022 at 03:26:20PM -0700, Nathan Huckleberry wrote:
> > > The key_powers array is not guaranteed to be 16-byte aligned, so using
> > > movaps to operate on key_powers is not allowed.
> > >
> > > Switch movaps to movups.
> > >
> > > Fixes: 34f7f6c30112 ("crypto: x86/polyval - Add PCLMULQDQ accelerated implementation of POLYVAL")
> > > Reported-by: Bruno Goncalves <bgoncalv@redhat.com>
> > > Signed-off-by: Nathan Huckleberry <nhuck@google.com>
> > > ---
> > > arch/x86/crypto/polyval-clmulni_asm.S | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/arch/x86/crypto/polyval-clmulni_asm.S b/arch/x86/crypto/polyval-clmulni_asm.S
> > > index a6ebe4e7dd2b..32b98cb53ddf 100644
> > > --- a/arch/x86/crypto/polyval-clmulni_asm.S
> > > +++ b/arch/x86/crypto/polyval-clmulni_asm.S
> > > @@ -234,7 +234,7 @@
> > >
> > > movups (MSG), %xmm0
> > > pxor SUM, %xmm0
> > > - movaps (KEY_POWERS), %xmm1
> > > + movups (KEY_POWERS), %xmm1
> > > schoolbook1_noload
> > > dec BLOCKS_LEFT
> > > addq $16, MSG
> >
> > I thought that crypto_tfm::__crt_ctx is guaranteed to be 16-byte aligned,
> > and that the x86 AES code relies on that property.
> >
> > But now I see that actually the x86 AES code manually aligns the context.
> > See aes_ctx() in arch/x86/crypto/aesni-intel_glue.c.
> >
> > Did you consider doing the same for polyval?
>
> I'll submit a v2 aligning the tfm_ctx. I think that makes more sense
> than working on unaligned keys.
>
> Is there a need to do the same changes on arm64? The keys are also
> unaligned there.
>

arm64 defines ARCH_DMA_MINALIGN to 128, so I don't think the same issue applies
there. Also the instructions used don't assume aligned addresses.

- Eric