From: Sasha Levin Date: Mon, 1 Apr 2019 15:20:23 +0000 (-0400) Subject: fixes for 3.18 X-Git-Tag: v3.18.138~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79afaf08d7e4f5ef1ae6f0a56839c4bcef34e674;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 3.18 Signed-off-by: Sasha Levin --- diff --git a/queue-3.18/arm64-support-keyctl-system-call-in-32-bit-mode.patch b/queue-3.18/arm64-support-keyctl-system-call-in-32-bit-mode.patch new file mode 100644 index 00000000000..204111beba0 --- /dev/null +++ b/queue-3.18/arm64-support-keyctl-system-call-in-32-bit-mode.patch @@ -0,0 +1,37 @@ +From c0d7379e45cb2e5c256330a2efb5489945394105 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +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 +Signed-off-by: Will Deacon +Signed-off-by: Sasha Levin +--- + arch/arm64/Kconfig | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig +index e8d81283c4fe..4ddf817f4a5c 100644 +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig +@@ -558,6 +558,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-3.18/series b/queue-3.18/series index e4609a9be23..6c092ac3023 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -47,3 +47,4 @@ gpio-adnp-fix-testing-wrong-value-in-adnp_gpio_direction_input.patch kvm-reject-device-ioctls-from-processes-other-than-the-vm-s-creator.patch xhci-fix-port-resume-done-detection-for-ss-ports-with-lpm-enabled.patch arm-imx6q-cpuidle-fix-bug-that-cpu-might-not-wake-up-at-expected-time.patch +arm64-support-keyctl-system-call-in-32-bit-mode.patch