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

Commit 6e556478 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.139 into android-4.9 



Changes in 4.9.139
	flow_dissector: do not dissect l4 ports for fragments
	ip_tunnel: don't force DF when MTU is locked
	net-gro: reset skb->pkt_type in napi_reuse_skb()
	sctp: not allow to set asoc prsctp_enable by sockopt
	tg3: Add PHY reset for 5717/5719/5720 in change ring and flow control paths
	usbnet: smsc95xx: disable carrier check while suspending
	inet: frags: better deal with smp races
	ipv6: Fix PMTU updates for UDP/raw sockets in presence of VRF
	kbuild: Add better clang cross build support
	kbuild: clang: add -no-integrated-as to KBUILD_[AC]FLAGS
	kbuild: Consolidate header generation from ASM offset information
	kbuild: consolidate redundant sed script ASM offset generation
	kbuild: fix asm-offset generation to work with clang
	kbuild: drop -Wno-unknown-warning-option from clang options
	kbuild, LLVMLinux: Add -Werror to cc-option to support clang
	kbuild: use -Oz instead of -Os when using clang
	kbuild: Add support to generate LLVM assembly files
	modules: mark __inittest/__exittest as __maybe_unused
	x86/kbuild: Use cc-option to enable -falign-{jumps/loops}
	crypto, x86: aesni - fix token pasting for clang
	kbuild: Add __cc-option macro
	x86/build: Use __cc-option for boot code compiler options
	x86/build: Specify stack alignment for clang
	kbuild: clang: Disable 'address-of-packed-member' warning
	crypto: arm64/sha - avoid non-standard inline asm tricks
	x86/boot: #undef memcpy() et al in string.c
	efi/libstub/arm64: Use hidden attribute for struct screen_info reference
	efi/libstub/arm64: Force 'hidden' visibility for section markers
	efi/libstub: Preserve .debug sections after absolute relocation check
	efi/libstub/arm64: Set -fpie when building the EFI stub
	x86/build: Fix stack alignment for CLang
	x86/build: Use cc-option to validate stack alignment parameter
	Kbuild: use -fshort-wchar globally
	arm64: uaccess: suppress spurious clang warning
	ARM: add more CPU part numbers for Cortex and Brahma B15 CPUs
	ARM: bugs: prepare processor bug infrastructure
	ARM: bugs: hook processor bug checking into SMP and suspend paths
	ARM: bugs: add support for per-processor bug checking
	ARM: spectre: add Kconfig symbol for CPUs vulnerable to Spectre
	ARM: spectre-v2: harden branch predictor on context switches
	ARM: spectre-v2: add Cortex A8 and A15 validation of the IBE bit
	ARM: spectre-v2: harden user aborts in kernel space
	ARM: spectre-v2: add firmware based hardening
	ARM: spectre-v2: warn about incorrect context switching functions
	ARM: KVM: invalidate BTB on guest exit for Cortex-A12/A17
	ARM: KVM: invalidate icache on guest exit for Cortex-A15
	ARM: spectre-v2: KVM: invalidate icache on guest exit for Brahma B15
	ARM: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling
	ARM: KVM: report support for SMCCC_ARCH_WORKAROUND_1
	ARM: spectre-v1: add speculation barrier (csdb) macros
	ARM: spectre-v1: add array_index_mask_nospec() implementation
	ARM: spectre-v1: fix syscall entry
	ARM: signal: copy registers using __copy_from_user()
	ARM: vfp: use __copy_from_user() when restoring VFP state
	ARM: oabi-compat: copy semops using __copy_from_user()
	ARM: use __inttype() in get_user()
	ARM: spectre-v1: use get_user() for __get_user()
	ARM: spectre-v1: mitigate user accesses
	Linux 4.9.139

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 5e107580 44caf8b3

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 138

SUBLEVEL = 139

EXTRAVERSION =

NAME = Roaring Lionus
@@ -395,7 +395,7 @@ LINUXINCLUDE += $(filter-out $(LINUXINCLUDE),$(USERINCLUDE)) 


KBUILD_AFLAGS   := -D__ASSEMBLY__

KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

		   -fno-strict-aliasing -fno-common \

		   -fno-strict-aliasing -fno-common -fshort-wchar \

		   -Werror-implicit-function-declaration \

		   -Wno-format-security \

		   -std=gnu89

arch/arm/include/asm/assembler.h

+12 −0
Original line number Diff line number Diff line
@@ -445,11 +445,23 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) 
	.size \name , . - \name

	.endm



	.macro	csdb

#ifdef CONFIG_THUMB2_KERNEL

	.inst.w	0xf3af8014

#else

	.inst	0xe320f014

#endif

	.endm



	.macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req

#ifndef CONFIG_CPU_USE_DOMAINS

	adds	\tmp, \addr, #\size - 1

	sbcccs	\tmp, \tmp, \limit

	bcs	\bad

#ifdef CONFIG_CPU_SPECTRE

	movcs	\addr, #0

	csdb

#endif

#endif

	.endm

arch/arm/include/asm/barrier.h

+32 −0
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 
#define isb(option) __asm__ __volatile__ ("isb " #option : : : "memory")

#define dsb(option) __asm__ __volatile__ ("dsb " #option : : : "memory")

#define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory")

#ifdef CONFIG_THUMB2_KERNEL

#define CSDB	".inst.w 0xf3af8014"

#else

#define CSDB	".inst	0xe320f014"

#endif

#define csdb() __asm__ __volatile__(CSDB : : : "memory")

#elif defined(CONFIG_CPU_XSC3) || __LINUX_ARM_ARCH__ == 6

#define isb(x) __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \

				    : : "r" (0) : "memory")
@@ -36,6 +42,13 @@ 
#define dmb(x) __asm__ __volatile__ ("" : : : "memory")

#endif



#ifndef CSDB

#define CSDB

#endif

#ifndef csdb

#define csdb()

#endif



#ifdef CONFIG_ARM_HEAVY_MB

extern void (*soc_mb)(void);

extern void arm_heavy_mb(void);
@@ -62,6 +75,25 @@ extern void arm_heavy_mb(void); 
#define __smp_rmb()	__smp_mb()

#define __smp_wmb()	dmb(ishst)



#ifdef CONFIG_CPU_SPECTRE

static inline unsigned long array_index_mask_nospec(unsigned long idx,

						    unsigned long sz)

{

	unsigned long mask;



	asm volatile(

		"cmp	%1, %2\n"

	"	sbc	%0, %1, %1\n"

	CSDB

	: "=r" (mask)

	: "r" (idx), "Ir" (sz)

	: "cc");



	return mask;

}

#define array_index_mask_nospec array_index_mask_nospec

#endif



#include <asm-generic/barrier.h>



#endif /* !__ASSEMBLY__ */

arch/arm/include/asm/bugs.h

+4 −2
Original line number Diff line number Diff line
@@ -10,12 +10,14 @@ 
#ifndef __ASM_BUGS_H

#define __ASM_BUGS_H



#ifdef CONFIG_MMU

extern void check_writebuffer_bugs(void);



#define check_bugs() check_writebuffer_bugs()

#ifdef CONFIG_MMU

extern void check_bugs(void);

extern void check_other_bugs(void);

#else

#define check_bugs() do { } while (0)

#define check_other_bugs() do { } while (0)

#endif



#endif

arch/arm/include/asm/cp15.h

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ 
#define __write_sysreg(v, r, w, c, t)	asm volatile(w " " c : : "r" ((t)(v)))

#define write_sysreg(v, ...)		__write_sysreg(v, __VA_ARGS__)



#define BPIALL				__ACCESS_CP15(c7, 0, c5, 6)

#define ICIALLU				__ACCESS_CP15(c7, 0, c5, 0)



extern unsigned long cr_alignment;	/* defined in entry-armv.S */



static inline unsigned long get_cr(void)