Commit c2b43854 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:

 - Fix clang-related relocation warning in futex code

 - Fix incorrect use of get_kernel_nofault()

 - Fix bad code generation in __get_user_check() when kasan is enabled

 - Ensure TLB function table is correctly aligned

 - Remove duplicated string function definitions in decompressor

 - Fix link-time orphan section warnings

 - Fix old-style function prototype for arch_init_kprobes()

 - Only warn about XIP address when not compile testing

 - Handle BE32 big endian for keystone2 remapping

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9148/1: handle CONFIG_CPU_ENDIAN_BE32 in arch/arm/kernel/head.S
  ARM: 9141/1: only warn about XIP address when not compile testing
  ARM: 9139/1: kprobes: fix arch_init_kprobes() prototype
  ARM: 9138/1: fix link warning with XIP + frame-pointer
  ARM: 9134/1: remove duplicate memcpy() definition
  ARM: 9133/1: mm: proc-macros: ensure *_tlb_fns are 4B aligned
  ARM: 9132/1: Fix __get_user_check failure with ARM KASAN images
  ARM: 9125/1: fix incorrect use of get_kernel_nofault()
  ARM: 9122/1: select HAVE_FUTEX_CMPXCHG
parents 4862649f 00568b8a

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ config ARM 
	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL

	select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG

	select HAVE_FUNCTION_TRACER if !XIP_KERNEL

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_GCC_PLUGINS

	select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)

	select HAVE_IRQ_TIME_ACCOUNTING

arch/arm/boot/compressed/decompress.c

+3 −0
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ extern char * strchrnul(const char *, int); 
#endif



#ifdef CONFIG_KERNEL_XZ

/* Prevent KASAN override of string helpers in decompressor */

#undef memmove

#define memmove memmove

#undef memcpy

#define memcpy memcpy

#include "../../../../lib/decompress_unxz.c"

#endif

arch/arm/include/asm/uaccess.h

+3 −1
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ extern int __get_user_64t_4(void *); 
		register unsigned long __l asm("r1") = __limit;		\

		register int __e asm("r0");				\

		unsigned int __ua_flags = uaccess_save_and_enable();	\

		int __tmp_e;						\

		switch (sizeof(*(__p))) {				\

		case 1:							\

			if (sizeof((x)) >= 8)				\
@@ -203,9 +204,10 @@ extern int __get_user_64t_4(void *); 
			break;						\

		default: __e = __get_user_bad(); break;			\

		}							\

		__tmp_e = __e;						\

		uaccess_restore(__ua_flags);				\

		x = (typeof(*(p))) __r2;				\

		__e;							\

		__tmp_e;						\

	})



#define get_user(x, p)							\

arch/arm/kernel/head.S

+2 −2
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ __create_page_tables: 
	add	r0, r4, #KERNEL_OFFSET >> (SECTION_SHIFT - PMD_ORDER)

	ldr	r6, =(_end - 1)

	adr_l	r5, kernel_sec_start		@ _pa(kernel_sec_start)

#ifdef CONFIG_CPU_ENDIAN_BE8

#if defined CONFIG_CPU_ENDIAN_BE8 || defined CONFIG_CPU_ENDIAN_BE32

	str	r8, [r5, #4]			@ Save physical start of kernel (BE)

#else

	str	r8, [r5]			@ Save physical start of kernel (LE)
@@ -266,7 +266,7 @@ __create_page_tables: 
	bls	1b

	eor	r3, r3, r7			@ Remove the MMU flags

	adr_l	r5, kernel_sec_end		@ _pa(kernel_sec_end)

#ifdef CONFIG_CPU_ENDIAN_BE8

#if defined CONFIG_CPU_ENDIAN_BE8 || defined CONFIG_CPU_ENDIAN_BE32

	str	r3, [r5, #4]			@ Save physical end of kernel (BE)

#else

	str	r3, [r5]			@ Save physical end of kernel (LE)

arch/arm/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static void dump_mem(const char *lvl, const char *str, unsigned long bottom, 
		for (p = first, i = 0; i < 8 && p < top; i++, p += 4) {

			if (p >= bottom && p < top) {

				unsigned long val;

				if (get_kernel_nofault(val, (unsigned long *)p))

				if (!get_kernel_nofault(val, (unsigned long *)p))

					sprintf(str + i * 9, " %08lx", val);

				else

					sprintf(str + i * 9, " ????????");