From: Greg Kroah-Hartman Date: Sun, 12 Oct 2014 04:08:40 +0000 (-0700) Subject: remove queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch X-Git-Tag: v3.17.1~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9cd84d5876ed402c9d6ac8437a0cadfb058fe27;p=thirdparty%2Fkernel%2Fstable-queue.git remove queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch --- diff --git a/queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch b/queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch deleted file mode 100644 index 17a15b0e968..00000000000 --- a/queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4451d494b1910bf7b7f8381a637d0fe6d2142467 Mon Sep 17 00:00:00 2001 -From: Cristian Stoica -Date: Thu, 14 Aug 2014 13:51:57 +0300 -Subject: crypto: caam - fix addressing of struct member - -From: Cristian Stoica - -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 -Signed-off-by: Herbert Xu -Signed-off-by: Greg Kroah-Hartman - ---- - 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 -@@ -1345,9 +1345,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; diff --git a/queue-3.10/series b/queue-3.10/series index c2c6a66a50a..ebd86f36274 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -1,7 +1,6 @@ usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch usb-cp210x-add-support-for-seluxit-usb-dongle.patch usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch -crypto-caam-fix-addressing-of-struct-member.patch udf-avoid-infinite-loop-when-processing-indirect-icbs.patch perf-fix-perf-bug-in-fork.patch init-kconfig-fix-have_futex_cmpxchg-to-not-break-up-the-expert-menu.patch