Merge tag 'acpi-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[deliverable/linux.git] / arch / x86 / crypto / chacha20_glue.c

diff --git a/arch/x86/crypto/chacha20_glue.c b/arch/x86/crypto/chacha20_glue.c
index 2d5c2e0bd939b9e267102adf3577a91e53abfce1..f910d1d449f005ba26c3d4d65df6a05cc7f9b924 100644 (file)
--- a/arch/x86/crypto/chacha20_glue.c
+++ b/arch/x86/crypto/chacha20_glue.c
@@ -70,7 +70,7 @@ static int chacha20_simd(struct blkcipher_desc *desc, struct scatterlist *dst,
        struct blkcipher_walk walk;
        int err;
 
-       if (!may_use_simd())
+       if (nbytes <= CHACHA20_BLOCK_SIZE || !may_use_simd())
                return crypto_chacha20_crypt(desc, dst, src, nbytes);
 
        state = (u32 *)roundup((uintptr_t)state_buf, CHACHA20_STATE_ALIGN);