From: Greg Kroah-Hartman Date: Wed, 6 Jul 2016 23:54:34 +0000 (-0700) Subject: 3.14-stable patches X-Git-Tag: v4.4.15~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02a1a866ce225c635ea9504ef065500425f68775;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: crypto-ux500-memmove-the-right-size.patch --- diff --git a/queue-3.14/crypto-ux500-memmove-the-right-size.patch b/queue-3.14/crypto-ux500-memmove-the-right-size.patch new file mode 100644 index 00000000000..cf9c9ad445b --- /dev/null +++ b/queue-3.14/crypto-ux500-memmove-the-right-size.patch @@ -0,0 +1,43 @@ +From 19ced623db2fe91604d69f7d86b03144c5107739 Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Wed, 8 Jun 2016 14:56:39 +0200 +Subject: crypto: ux500 - memmove the right size + +From: Linus Walleij + +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 +Reported-by: David Binderman +Signed-off-by: Linus Walleij +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/crypto/ux500/hash/hash_core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/crypto/ux500/hash/hash_core.c ++++ b/drivers/crypto/ux500/hash/hash_core.c +@@ -797,7 +797,7 @@ static int hash_process_data(struct hash + &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() failed!\n", +@@ -848,7 +848,7 @@ static int hash_process_data(struct hash + + 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() failed!\n", + __func__); diff --git a/queue-3.14/series b/queue-3.14/series new file mode 100644 index 00000000000..f0ef84e6673 --- /dev/null +++ b/queue-3.14/series @@ -0,0 +1 @@ +crypto-ux500-memmove-the-right-size.patch diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..2ed53db0be5 --- /dev/null +++ b/queue-4.4/series @@ -0,0 +1,17 @@ +net_sched-fix-pfifo_head_drop-behavior-vs-backlog.patch +net-don-t-forget-pr_fmt-on-net_dbg_ratelimited-for-config_dynamic_debug.patch +sit-correct-ip-protocol-used-in-ipip6_err.patch +esp-fix-esn-generation-under-udp-encapsulation.patch +netem-fix-a-use-after-free.patch +ipmr-ip6mr-initialize-the-last-assert-time-of-mfc-entries.patch +bridge-fix-ipv6-mc-snooping-if-bridge-has-no-ipv6-address.patch +sock_diag-do-not-broadcast-raw-socket-destruction.patch +bpf-perf-delay-release-of-bpf-prog-after-grace-period.patch +neigh-explicitly-declare-rcu-bh-read-side-critical-section-in-neigh_xmit.patch +net-macb-fix-default-configuration-for-gmac-on-at91.patch +net-alx-work-around-the-dma-rx-overflow-issue.patch +bpf-try-harder-on-clones-when-writing-into-skb.patch +ax.25-close-socket-connection-on-session-completion.patch +crypto-vmx-increase-priority-of-aes-cbc-cipher.patch +crypto-ux500-memmove-the-right-size.patch +crypto-user-re-add-size-check-for-crypto_msg_getalg.patch diff --git a/queue-4.6/series b/queue-4.6/series new file mode 100644 index 00000000000..28680d0e723 --- /dev/null +++ b/queue-4.6/series @@ -0,0 +1,16 @@ +net_sched-fix-pfifo_head_drop-behavior-vs-backlog.patch +act_ipt-fix-a-bind-refcnt-leak.patch +net-don-t-forget-pr_fmt-on-net_dbg_ratelimited-for-config_dynamic_debug.patch +sit-correct-ip-protocol-used-in-ipip6_err.patch +kcm-fix-proc-memory-leak.patch +esp-fix-esn-generation-under-udp-encapsulation.patch +netem-fix-a-use-after-free.patch +ipmr-ip6mr-initialize-the-last-assert-time-of-mfc-entries.patch +bridge-fix-ipv6-mc-snooping-if-bridge-has-no-ipv6-address.patch +sock_diag-do-not-broadcast-raw-socket-destruction.patch +bpf-perf-delay-release-of-bpf-prog-after-grace-period.patch +neigh-explicitly-declare-rcu-bh-read-side-critical-section-in-neigh_xmit.patch +ax.25-close-socket-connection-on-session-completion.patch +crypto-vmx-increase-priority-of-aes-cbc-cipher.patch +crypto-ux500-memmove-the-right-size.patch +crypto-user-re-add-size-check-for-crypto_msg_getalg.patch