diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2016-06-08 08:56:39 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-06-13 05:43:05 -0400 |
commit | 19ced623db2fe91604d69f7d86b03144c5107739 (patch) | |
tree | e21bb594a9351e308144b475afa4d079ba338e27 | |
parent | 12d3f49e1ffbbf8cbbb60acae5a21103c5c841ac (diff) |
crypto: ux500 - memmove the right size
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>
-rw-r--r-- | drivers/crypto/ux500/hash/hash_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index 574e87c7f2b8..9acccad26928 100644 --- a/drivers/crypto/ux500/hash/hash_core.c +++ b/drivers/crypto/ux500/hash/hash_core.c | |||
@@ -781,7 +781,7 @@ static int hash_process_data(struct hash_device_data *device_data, | |||
781 | &device_data->state); | 781 | &device_data->state); |
782 | memmove(req_ctx->state.buffer, | 782 | memmove(req_ctx->state.buffer, |
783 | device_data->state.buffer, | 783 | device_data->state.buffer, |
784 | HASH_BLOCK_SIZE / sizeof(u32)); | 784 | HASH_BLOCK_SIZE); |
785 | if (ret) { | 785 | if (ret) { |
786 | dev_err(device_data->dev, | 786 | dev_err(device_data->dev, |
787 | "%s: hash_resume_state() failed!\n", | 787 | "%s: hash_resume_state() failed!\n", |
@@ -832,7 +832,7 @@ static int hash_process_data(struct hash_device_data *device_data, | |||
832 | 832 | ||
833 | memmove(device_data->state.buffer, | 833 | memmove(device_data->state.buffer, |
834 | req_ctx->state.buffer, | 834 | req_ctx->state.buffer, |
835 | HASH_BLOCK_SIZE / sizeof(u32)); | 835 | HASH_BLOCK_SIZE); |
836 | if (ret) { | 836 | if (ret) { |
837 | dev_err(device_data->dev, "%s: hash_save_state() failed!\n", | 837 | dev_err(device_data->dev, "%s: hash_save_state() failed!\n", |
838 | __func__); | 838 | __func__); |