4.14-stable patches

added patches:
	crypto-talitos-fix-kernel-oops-on-hashing-an-empty-file.patch
	drm-i915-fix-intel_backlight_device_register-declaration.patch

diff --git a/queue-4.14/crypto-talitos-fix-kernel-oops-on-hashing-an-empty-file.patch b/queue-4.14/crypto-talitos-fix-kernel-oops-on-hashing-an-empty-file.patch
new file mode 100644 (file)
index 0000000..6231534
--- /dev/null
+++ b/queue-4.14/crypto-talitos-fix-kernel-oops-on-hashing-an-empty-file.patch
@@ -0,0 +1,64 @@
+From 87a81dce53b1ea61acaeefa5191a0376a2d1d721 Mon Sep 17 00:00:00 2001
+From: LEROY Christophe <christophe.leroy@c-s.fr>
+Date: Fri, 26 Jan 2018 17:09:59 +0100
+Subject: crypto: talitos - fix Kernel Oops on hashing an empty file
+
+From: LEROY Christophe <christophe.leroy@c-s.fr>
+
+commit 87a81dce53b1ea61acaeefa5191a0376a2d1d721 upstream.
+
+Performing the hash of an empty file leads to a kernel Oops
+
+[   44.504600] Unable to handle kernel paging request for data at address 0x0000000c
+[   44.512819] Faulting instruction address: 0xc02d2be8
+[   44.524088] Oops: Kernel access of bad area, sig: 11 [#1]
+[   44.529171] BE PREEMPT CMPC885
+[   44.532232] CPU: 0 PID: 491 Comm: md5sum Not tainted 4.15.0-rc8-00211-g3a968610b6ea #81
+[   44.540814] NIP:  c02d2be8 LR: c02d2984 CTR: 00000000
+[   44.545812] REGS: c6813c90 TRAP: 0300   Not tainted  (4.15.0-rc8-00211-g3a968610b6ea)
+[   44.554223] MSR:  00009032 <EE,ME,IR,DR,RI>  CR: 48222822  XER: 20000000
+[   44.560855] DAR: 0000000c DSISR: c0000000
+[   44.560855] GPR00: c02d28fc c6813d40 c6828000 c646fa40 00000001 00000001 00000001 00000000
+[   44.560855] GPR08: 0000004c 00000000 c000bfcc 00000000 28222822 100280d4 00000000 10020008
+[   44.560855] GPR16: 00000000 00000020 00000000 00000000 10024008 00000000 c646f9f0 c6179a10
+[   44.560855] GPR24: 00000000 00000001 c62f0018 c6179a10 00000000 c6367a30 c62f0000 c646f9c0
+[   44.598542] NIP [c02d2be8] ahash_process_req+0x448/0x700
+[   44.603751] LR [c02d2984] ahash_process_req+0x1e4/0x700
+[   44.608868] Call Trace:
+[   44.611329] [c6813d40] [c02d28fc] ahash_process_req+0x15c/0x700 (unreliable)
+[   44.618302] [c6813d90] [c02060c4] hash_recvmsg+0x11c/0x210
+[   44.623716] [c6813db0] [c0331354] ___sys_recvmsg+0x98/0x138
+[   44.629226] [c6813eb0] [c03332c0] __sys_recvmsg+0x40/0x84
+[   44.634562] [c6813f10] [c03336c0] SyS_socketcall+0xb8/0x1d4
+[   44.640073] [c6813f40] [c000d1ac] ret_from_syscall+0x0/0x38
+[   44.645530] Instruction dump:
+[   44.648465] 38c00001 7f63db78 4e800421 7c791b78 54690ffe 0f090000 80ff0190 2f870000
+[   44.656122] 40befe50 2f990001 409e0210 813f01bc <8129000c> b39e003a 7d29c214 913e003c
+
+This patch fixes that Oops by checking if src is NULL.
+
+Fixes: 6a1e8d14156d4 ("crypto: talitos - making mapping helpers more generic")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ drivers/crypto/talitos.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/crypto/talitos.c
++++ b/drivers/crypto/talitos.c
+@@ -1124,6 +1124,11 @@ int talitos_sg_map(struct device *dev, s
+       struct talitos_private *priv = dev_get_drvdata(dev);
+       bool is_sec1 = has_ftr_sec1(priv);
+ 
++      if (!src) {
++              *ptr = zero_entry;
++              return 1;
++      }
++
+       to_talitos_ptr_len(ptr, len, is_sec1);
+       to_talitos_ptr_ext_set(ptr, 0, is_sec1);
+ 

diff --git a/queue-4.14/drm-i915-fix-intel_backlight_device_register-declaration.patch b/queue-4.14/drm-i915-fix-intel_backlight_device_register-declaration.patch
new file mode 100644 (file)
index 0000000..ccf0b43
--- /dev/null
+++ b/queue-4.14/drm-i915-fix-intel_backlight_device_register-declaration.patch
@@ -0,0 +1,42 @@
+From ac29fc66855b79c2960c63a4a66952d5b721d698 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 27 Nov 2017 16:10:27 +0100
+Subject: drm/i915: fix intel_backlight_device_register declaration
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit ac29fc66855b79c2960c63a4a66952d5b721d698 upstream.
+
+The alternative intel_backlight_device_register() definition apparently
+never got used, but I have now run into a case of i915 being compiled
+without CONFIG_BACKLIGHT_CLASS_DEVICE, resulting in a number of
+identical warnings:
+
+drivers/gpu/drm/i915/intel_drv.h:1739:12: error: 'intel_backlight_device_register' defined but not used [-Werror=unused-function]
+
+This marks the function as 'inline', which was surely the original
+intention here.
+
+Fixes: 1ebaa0b9c2d4 ("drm/i915: Move backlight registration to connector registration")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: https://patchwork.freedesktop.org/patch/msgid/20171127151239.1813673-1-arnd@arndb.de
+(cherry picked from commit 2de2d0b063b08becb2c67a2c338c44e37bdcffee)
+Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/intel_drv.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/intel_drv.h
++++ b/drivers/gpu/drm/i915/intel_drv.h
+@@ -1708,7 +1708,7 @@ extern struct drm_display_mode *intel_fi
+ int intel_backlight_device_register(struct intel_connector *connector);
+ void intel_backlight_device_unregister(struct intel_connector *connector);
+ #else /* CONFIG_BACKLIGHT_CLASS_DEVICE */
+-static int intel_backlight_device_register(struct intel_connector *connector)
++static inline int intel_backlight_device_register(struct intel_connector *connector)
+ {
+       return 0;
+ }

diff --git a/queue-4.14/series b/queue-4.14/series
index 2c79c023858f52245741795f1f266d67df084dc5..306d118eb55a5a436eb8e8471754a5c382fc7e46 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -151,3 +151,5 @@ xen-xen_acpi_processor-is-dom0-only.patch
 pci-rcar-fix-use-after-free-in-probe-error-path.patch
 powerpc-perf-imc-fix-nest-imc-cpuhotplug-callback-failure.patch
 hippi-fix-a-fix-a-possible-sleep-in-atomic-bug-in-rr_close.patch
+crypto-talitos-fix-kernel-oops-on-hashing-an-empty-file.patch
+drm-i915-fix-intel_backlight_device_register-declaration.patch