This is a note to let you know that I've just added the patch titled

    crypto: caam - fix addressing of struct member

to the 3.14-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     crypto-caam-fix-addressing-of-struct-member.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 4451d494b1910bf7b7f8381a637d0fe6d2142467 Mon Sep 17 00:00:00 2001
From: Cristian Stoica <[email protected]>
Date: Thu, 14 Aug 2014 13:51:57 +0300
Subject: crypto: caam - fix addressing of struct member

From: Cristian Stoica <[email protected]>

commit 4451d494b1910bf7b7f8381a637d0fe6d2142467 upstream.

buf_0 and buf_1 in caam_hash_state are not next to each other.
Accessing buf_1 is incorrect from &buf_0 with an offset of only
size_of(buf_0). The same issue is also with buflen_0 and buflen_1

Signed-off-by: Cristian Stoica <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/crypto/caam/caamhash.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/crypto/caam/caamhash.c
+++ b/drivers/crypto/caam/caamhash.c
@@ -1348,9 +1348,9 @@ static int ahash_update_first(struct aha
        struct device *jrdev = ctx->jrdev;
        gfp_t flags = (req->base.flags & (CRYPTO_TFM_REQ_MAY_BACKLOG |
                       CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC;
-       u8 *next_buf = state->buf_0 + state->current_buf *
-                      CAAM_MAX_HASH_BLOCK_SIZE;
-       int *next_buflen = &state->buflen_0 + state->current_buf;
+       u8 *next_buf = state->current_buf ? state->buf_1 : state->buf_0;
+       int *next_buflen = state->current_buf ?
+               &state->buflen_1 : &state->buflen_0;
        int to_hash;
        u32 *sh_desc = ctx->sh_desc_update_first, *desc;
        dma_addr_t ptr = ctx->sh_desc_update_first_dma;


Patches currently in stable-queue which might be from 
[email protected] are

queue-3.14/crypto-caam-fix-addressing-of-struct-member.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to