Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25a7a9f9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.159 into android-4.19-stable 



Changes in 4.19.159
	powerpc/64s: move some exception handlers out of line
	powerpc/64s: flush L1D on kernel entry
	powerpc: Add a framework for user access tracking
	powerpc: Implement user_access_begin and friends
	powerpc: Fix __clear_user() with KUAP enabled
	powerpc/uaccess: Evaluate macro arguments once, before user access is allowed
	powerpc/64s: flush L1D after user accesses
	Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file"
	powerpc/8xx: Always fault when _PAGE_ACCESSED is not set
	Input: sunkbd - avoid use-after-free in teardown paths
	mac80211: always wind down STA state
	can: proc: can_remove_proc(): silence remove_proc_entry warning
	KVM: x86: clflushopt should be treated as a no-op by emulation
	ACPI: GED: fix -Wformat
	Linux 4.19.159

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Id5b2e80eb46200b260c8d9c4ce6601c23a63a59e
parents fbe7247e 76bda503

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -2573,6 +2573,8 @@ 
					       mds=off [X86]

					       tsx_async_abort=off [X86]

					       kvm.nx_huge_pages=off [X86]

					       no_entry_flush [PPC]

					       no_uaccess_flush [PPC]



				Exceptions:

					       This does not have any effect on
@@ -2883,6 +2885,8 @@ 


	noefi		Disable EFI runtime services support.



	no_entry_flush  [PPC] Don't flush the L1-D cache when entering the kernel.



	noexec		[IA-64]



	noexec		[X86]
@@ -2932,6 +2936,9 @@ 
	nospec_store_bypass_disable

			[HW] Disable all mitigations for the Speculative Store Bypass vulnerability



	no_uaccess_flush

	                [PPC] Don't flush the L1-D cache after accessing user data.



	noxsave		[BUGS=X86] Disables x86 extended register state save

			and restore using xsave. The kernel will fallback to

			enabling legacy floating-point and sse state.

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 158

SUBLEVEL = 159

EXTRAVERSION =

NAME = "People's Front"

arch/powerpc/include/asm/book3s/64/kup-radix.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_BOOK3S_64_KUP_RADIX_H

#define _ASM_POWERPC_BOOK3S_64_KUP_RADIX_H



DECLARE_STATIC_KEY_FALSE(uaccess_flush_key);



/* Prototype for function defined in exceptions-64s.S */

void do_uaccess_flush(void);



static __always_inline void allow_user_access(void __user *to, const void __user *from,

					      unsigned long size)

{

}



static inline void prevent_user_access(void __user *to, const void __user *from,

				       unsigned long size)

{

	if (static_branch_unlikely(&uaccess_flush_key))

		do_uaccess_flush();

}



#endif /* _ASM_POWERPC_BOOK3S_64_KUP_RADIX_H */

arch/powerpc/include/asm/exception-64s.h

+8 −1
Original line number Diff line number Diff line
@@ -90,11 +90,18 @@ 
	nop;								\

	nop



#define ENTRY_FLUSH_SLOT						\

	ENTRY_FLUSH_FIXUP_SECTION;					\

	nop;								\

	nop;								\

	nop;



/*

 * r10 must be free to use, r13 must be paca

 */

#define INTERRUPT_TO_KERNEL						\

	STF_ENTRY_BARRIER_SLOT

	STF_ENTRY_BARRIER_SLOT;						\

	ENTRY_FLUSH_SLOT



/*

 * Macros for annotating the expected destination of (h)rfid

arch/powerpc/include/asm/feature-fixups.h

+19 −0
Original line number Diff line number Diff line
@@ -205,6 +205,22 @@ label##3: \ 
	FTR_ENTRY_OFFSET 955b-956b;			\

	.popsection;



#define UACCESS_FLUSH_FIXUP_SECTION			\

959:							\

	.pushsection __uaccess_flush_fixup,"a";		\

	.align 2;					\

960:							\

	FTR_ENTRY_OFFSET 959b-960b;			\

	.popsection;



#define ENTRY_FLUSH_FIXUP_SECTION			\

957:							\

	.pushsection __entry_flush_fixup,"a";		\

	.align 2;					\

958:							\

	FTR_ENTRY_OFFSET 957b-958b;			\

	.popsection;



#define RFI_FLUSH_FIXUP_SECTION				\

951:							\

	.pushsection __rfi_flush_fixup,"a";		\
@@ -237,8 +253,11 @@ label##3: \ 
#include <linux/types.h>



extern long stf_barrier_fallback;

extern long entry_flush_fallback;

extern long __start___stf_entry_barrier_fixup, __stop___stf_entry_barrier_fixup;

extern long __start___stf_exit_barrier_fixup, __stop___stf_exit_barrier_fixup;

extern long __start___uaccess_flush_fixup, __stop___uaccess_flush_fixup;

extern long __start___entry_flush_fixup, __stop___entry_flush_fixup;

extern long __start___rfi_flush_fixup, __stop___rfi_flush_fixup;

extern long __start___barrier_nospec_fixup, __stop___barrier_nospec_fixup;

extern long __start__btb_flush_fixup, __stop__btb_flush_fixup;