]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
crypto: ux500 - memmove the right size
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 8 Jun 2016 12:56:39 +0000 (14:56 +0200)
committerWilly Tarreau <w@1wt.eu>
Sat, 27 Aug 2016 09:40:19 +0000 (11:40 +0200)
commit 19ced623db2fe91604d69f7d86b03144c5107739 upstream.

The hash buffer is really HASH_BLOCK_SIZE bytes, someone
must have thought that memmove takes n*u32 words by mistake.
Tests work as good/bad as before after this patch.

Cc: Joakim Bech <joakim.bech@linaro.org>
Cc: stable@vger.kernel.org
Reported-by: David Binderman <linuxdev.baldrick@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/crypto/ux500/hash/hash_core.c

index 6789c165391326a646c167af8df6e725d526b99c..cde4a6e0fab069dc6238ddf8bd7be077b5d3de6a 100644 (file)
@@ -806,7 +806,7 @@ int hash_process_data(
                                                &device_data->state);
                                memmove(req_ctx->state.buffer,
                                                device_data->state.buffer,
-                                               HASH_BLOCK_SIZE / sizeof(u32));
+                                               HASH_BLOCK_SIZE);
                                if (ret) {
                                        dev_err(device_data->dev, "[%s] "
                                                        "hash_resume_state()"
@@ -858,7 +858,7 @@ int hash_process_data(
 
                        memmove(device_data->state.buffer,
                                        req_ctx->state.buffer,
-                                       HASH_BLOCK_SIZE / sizeof(u32));
+                                       HASH_BLOCK_SIZE);
                        if (ret) {
                                dev_err(device_data->dev, "[%s] "
                                                "hash_save_state()"