diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0029-x86-usercopy-Replace-open-coded-stac-clac-with-__uac.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.9.21/0029-x86-usercopy-Replace-open-coded-stac-clac-with-__uac.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0029-x86-usercopy-Replace-open-coded-stac-clac-with-__uac.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0029-x86-usercopy-Replace-open-coded-stac-clac-with-__uac.patch deleted file mode 100644 index a27e1b16..00000000 --- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0029-x86-usercopy-Replace-open-coded-stac-clac-with-__uac.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 73e4bfd188d510a576ca75964cd7939d97171e1f Mon Sep 17 00:00:00 2001 -From: Dan Williams <dan.j.williams@intel.com> -Date: Mon, 29 Jan 2018 17:02:44 -0800 -Subject: [PATCH 29/42] x86/usercopy: Replace open coded stac/clac with - __uaccess_{begin, end} - -(cherry picked from commit b5c4ae4f35325d520b230bab6eb3310613b72ac1) - -In preparation for converting some __uaccess_begin() instances to -__uacess_begin_nospec(), make sure all 'from user' uaccess paths are -using the _begin(), _end() helpers rather than open-coded stac() and -clac(). - -No functional changes. - -Suggested-by: Ingo Molnar <mingo@redhat.com> -Signed-off-by: Dan Williams <dan.j.williams@intel.com> -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> -Cc: linux-arch@vger.kernel.org -Cc: Tom Lendacky <thomas.lendacky@amd.com> -Cc: Kees Cook <keescook@chromium.org> -Cc: kernel-hardening@lists.openwall.com -Cc: gregkh@linuxfoundation.org -Cc: Al Viro <viro@zeniv.linux.org.uk> -Cc: torvalds@linux-foundation.org -Cc: alan@linux.intel.com -Link: https://lkml.kernel.org/r/151727416438.33451.17309465232057176966.stgit@dwillia2-desk3.amr.corp.intel.com -Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/lib/usercopy_32.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c -index 3bc7baf..9b5fa0f 100644 ---- a/arch/x86/lib/usercopy_32.c -+++ b/arch/x86/lib/usercopy_32.c -@@ -570,12 +570,12 @@ do { \ - unsigned long __copy_to_user_ll(void __user *to, const void *from, - unsigned long n) - { -- stac(); -+ __uaccess_begin(); - if (movsl_is_ok(to, from, n)) - __copy_user(to, from, n); - else - n = __copy_user_intel(to, from, n); -- clac(); -+ __uaccess_end(); - return n; - } - EXPORT_SYMBOL(__copy_to_user_ll); -@@ -627,7 +627,7 @@ EXPORT_SYMBOL(__copy_from_user_ll_nocache); - unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *from, - unsigned long n) - { -- stac(); -+ __uaccess_begin(); - #ifdef CONFIG_X86_INTEL_USERCOPY - if (n > 64 && static_cpu_has(X86_FEATURE_XMM2)) - n = __copy_user_intel_nocache(to, from, n); -@@ -636,7 +636,7 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr - #else - __copy_user(to, from, n); - #endif -- clac(); -+ __uaccess_end(); - return n; - } - EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero); --- -2.7.4 - |