From: Sasha Levin <sashal@kernel.org>
Date: Mon, 1 Apr 2019 15:20:22 +0000 (-0400)
Subject: fixes for 4.9
X-Git-Tag: v3.18.138~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dafd2301c8cf62f7e7d79c1c2169a29a0462e823;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 4.9

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.9/arm64-support-keyctl-system-call-in-32-bit-mode.patch b/queue-4.9/arm64-support-keyctl-system-call-in-32-bit-mode.patch
new file mode 100644
index 00000000000..42aab73096c
--- /dev/null
+++ b/queue-4.9/arm64-support-keyctl-system-call-in-32-bit-mode.patch
@@ -0,0 +1,37 @@
+From 5b2e9589e24ec2ef54171627804c7f623e7d88c1 Mon Sep 17 00:00:00 2001
+From: Eric Biggers <ebiggers@google.com>
+Date: Wed, 8 Mar 2017 16:27:04 -0800
+Subject: arm64: support keyctl() system call in 32-bit mode
+
+[ Upstream commit 5c2a625937ba49bc691089370638223d310cda9a ]
+
+As is the case for a number of other architectures that have a 32-bit
+compat mode, enable KEYS_COMPAT if both COMPAT and KEYS are enabled.
+This allows AArch32 programs to use the keyctl() system call when
+running on an AArch64 kernel.
+
+Signed-off-by: Eric Biggers <ebiggers@google.com>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/Kconfig | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
+index 3e43874568f9..2eb8ae1b2d03 100644
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -1079,6 +1079,10 @@ config SYSVIPC_COMPAT
+ 	def_bool y
+ 	depends on COMPAT && SYSVIPC
+ 
++config KEYS_COMPAT
++	def_bool y
++	depends on COMPAT && KEYS
++
+ endmenu
+ 
+ menu "Power management options"
+-- 
+2.19.1
+
diff --git a/queue-4.9/series b/queue-4.9/series
index 122b700e8dd..9a6d5d8626c 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -53,3 +53,4 @@ kvm-x86-emulate-msr_ia32_arch_capabilities-on-amd-hosts.patch
 usb-gadget-f_hid-fix-deadlock-in-f_hidg_write.patch
 xhci-fix-port-resume-done-detection-for-ss-ports-with-lpm-enabled.patch
 revert-usb-core-only-clean-up-what-we-allocated.patch
+arm64-support-keyctl-system-call-in-32-bit-mode.patch