From: Greg Kroah-Hartman Date: Mon, 10 Nov 2014 22:11:26 +0000 (+0900) Subject: 3.14-stable patches X-Git-Tag: v3.10.60~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe2a651b83f624f536bdbf3adbc279d0b0050fa5;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: crypto-algif-avoid-excessive-use-of-socket-buffer-in-skcipher.patch --- diff --git a/queue-3.14/crypto-algif-avoid-excessive-use-of-socket-buffer-in-skcipher.patch b/queue-3.14/crypto-algif-avoid-excessive-use-of-socket-buffer-in-skcipher.patch new file mode 100644 index 00000000000..c412c7acc4f --- /dev/null +++ b/queue-3.14/crypto-algif-avoid-excessive-use-of-socket-buffer-in-skcipher.patch @@ -0,0 +1,34 @@ +From e2cffb5f493a8b431dc87124388ea59b79f0bccb Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina +Date: Mon, 25 Aug 2014 11:49:54 +0200 +Subject: crypto: algif - avoid excessive use of socket buffer in skcipher + +From: Ondrej Kozina + +commit e2cffb5f493a8b431dc87124388ea59b79f0bccb upstream. + +On archs with PAGE_SIZE >= 64 KiB the function skcipher_alloc_sgl() +fails with -ENOMEM no matter what user space actually requested. +This is caused by the fact sock_kmalloc call inside the function tried +to allocate more memory than allowed by the default kernel socket buffer +size (kernel param net.core.optmem_max). + +Signed-off-by: Ondrej Kozina +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + crypto/algif_skcipher.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/crypto/algif_skcipher.c ++++ b/crypto/algif_skcipher.c +@@ -49,7 +49,7 @@ struct skcipher_ctx { + struct ablkcipher_request req; + }; + +-#define MAX_SGL_ENTS ((PAGE_SIZE - sizeof(struct skcipher_sg_list)) / \ ++#define MAX_SGL_ENTS ((4096 - sizeof(struct skcipher_sg_list)) / \ + sizeof(struct scatterlist) - 1) + + static inline int skcipher_sndbuf(struct sock *sk) diff --git a/queue-3.14/series b/queue-3.14/series index 7b38a2c1561..96bb83d4bea 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -160,7 +160,6 @@ usb-storage-handle-a-skipped-data-phase.patch usb-opticon-fix-non-atomic-allocation-in-write-path.patch usb-do-not-allow-usb_alloc_streams-on-unconfigured-devices.patch usb-kobil_sct-fix-non-atomic-allocation-in-write-path.patch -usb-remove-references-to-non-existent-plat_s5p-symbol.patch sh-fix-sh770x-scif-memory-regions.patch mm-free-compound-page-with-correct-order.patch cgroup-kmemleak-add-kmemleak_free-for-cgroup-deallocations.patch @@ -183,3 +182,4 @@ mac80211-fix-typo-in-starting-baserate-for-rts_cts_rate_idx.patch posix-timers-fix-stack-info-leak-in-timer_create.patch x86-apic-handle-a-bad-tsc-more-gracefully.patch mm-remove-false-warn_on-from-pagecache_isize_extended.patch +crypto-algif-avoid-excessive-use-of-socket-buffer-in-skcipher.patch diff --git a/queue-3.14/usb-remove-references-to-non-existent-plat_s5p-symbol.patch b/queue-3.14/usb-remove-references-to-non-existent-plat_s5p-symbol.patch deleted file mode 100644 index fbfccf52961..00000000000 --- a/queue-3.14/usb-remove-references-to-non-existent-plat_s5p-symbol.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cd6e245a2d061a8367e37aaece32cf3fc922de80 Mon Sep 17 00:00:00 2001 -From: Sylwester Nawrocki -Date: Tue, 7 Oct 2014 11:12:07 +0200 -Subject: usb: Remove references to non-existent PLAT_S5P symbol - -From: Sylwester Nawrocki - -commit cd6e245a2d061a8367e37aaece32cf3fc922de80 upstream. - -The PLAT_S5P Kconfig symbol was removed in commit d78c16ccde96 -("ARM: SAMSUNG: Remove remaining legacy code"). There are still -some references left, fix that by replacing them with ARCH_S5PV210. - -Fixes: d78c16ccde96 ("ARM: SAMSUNG: Remove remaining legacy code") -Reported-by: Paul Bolle -Acked-by: Jingoo Han -Signed-off-by: Sylwester Nawrocki -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/usb/host/Kconfig | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig -@@ -205,7 +205,7 @@ config USB_EHCI_SH - - config USB_EHCI_EXYNOS - tristate "EHCI support for Samsung S5P/EXYNOS SoC Series" -- depends on PLAT_S5P || ARCH_EXYNOS -+ depends on ARCH_S5PV210 || ARCH_EXYNOS - help - Enable support for the Samsung Exynos SOC's on-chip EHCI controller. - -@@ -494,7 +494,7 @@ config USB_OHCI_SH - - config USB_OHCI_EXYNOS - tristate "OHCI support for Samsung S5P/EXYNOS SoC Series" -- depends on PLAT_S5P || ARCH_EXYNOS -+ depends on ARCH_S5PV210 || ARCH_EXYNOS - help - Enable support for the Samsung Exynos SOC's on-chip OHCI controller. -