Commit 444fc5cd 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:

 - correct value of decompressor tag size in header

 - fix DACR value when we have nested exceptions

 - fix a missing newline on a kernel message

 - fix mask for ptrace thumb breakpoint hook

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook
  ARM: 8973/1: Add missing newline terminator to kernel message
  ARM: uaccess: fix DACR mismatch with nested exceptions
  ARM: uaccess: integrate uaccess_save and uaccess_restore
  ARM: uaccess: consolidate uaccess asm to asm/uaccess-asm.h
  ARM: 8970/1: decompressor: increase tag size
parents 9cb1fd0e 3866f217

arch/arm/boot/compressed/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ SECTIONS 
  }

  .table : ALIGN(4) {

    _table_start = .;

    LONG(ZIMAGE_MAGIC(2))

    LONG(ZIMAGE_MAGIC(4))

    LONG(ZIMAGE_MAGIC(0x5a534c4b))

    LONG(ZIMAGE_MAGIC(__piggy_size_addr - _start))

    LONG(ZIMAGE_MAGIC(_kernel_bss_size))

arch/arm/include/asm/assembler.h

+1 −74
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
#endif



#include <asm/ptrace.h>

#include <asm/domain.h>

#include <asm/opcodes-virt.h>

#include <asm/asm-offsets.h>

#include <asm/page.h>

#include <asm/thread_info.h>

#include <asm/uaccess-asm.h>



#define IOMEM(x)	(x)
@@ -446,79 +446,6 @@ 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

	sbcscc	\tmp, \tmp, \limit

	bcs	\bad

#ifdef CONFIG_CPU_SPECTRE

	movcs	\addr, #0

	csdb

#endif

#endif

	.endm



	.macro uaccess_mask_range_ptr, addr:req, size:req, limit:req, tmp:req

#ifdef CONFIG_CPU_SPECTRE

	sub	\tmp, \limit, #1

	subs	\tmp, \tmp, \addr	@ tmp = limit - 1 - addr

	addhs	\tmp, \tmp, #1		@ if (tmp >= 0) {

	subshs	\tmp, \tmp, \size	@ tmp = limit - (addr + size) }

	movlo	\addr, #0		@ if (tmp < 0) addr = NULL

	csdb

#endif

	.endm



	.macro	uaccess_disable, tmp, isb=1

#ifdef CONFIG_CPU_SW_DOMAIN_PAN

	/*

	 * Whenever we re-enter userspace, the domains should always be

	 * set appropriately.

	 */

	mov	\tmp, #DACR_UACCESS_DISABLE

	mcr	p15, 0, \tmp, c3, c0, 0		@ Set domain register

	.if	\isb

	instr_sync

	.endif

#endif

	.endm



	.macro	uaccess_enable, tmp, isb=1

#ifdef CONFIG_CPU_SW_DOMAIN_PAN

	/*

	 * Whenever we re-enter userspace, the domains should always be

	 * set appropriately.

	 */

	mov	\tmp, #DACR_UACCESS_ENABLE

	mcr	p15, 0, \tmp, c3, c0, 0

	.if	\isb

	instr_sync

	.endif

#endif

	.endm



	.macro	uaccess_save, tmp

#ifdef CONFIG_CPU_SW_DOMAIN_PAN

	mrc	p15, 0, \tmp, c3, c0, 0

	str	\tmp, [sp, #SVC_DACR]

#endif

	.endm



	.macro	uaccess_restore

#ifdef CONFIG_CPU_SW_DOMAIN_PAN

	ldr	r0, [sp, #SVC_DACR]

	mcr	p15, 0, r0, c3, c0, 0

#endif

	.endm



	.irp	c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo

	.macro	ret\c, reg

#if __LINUX_ARM_ARCH__ < 6

arch/arm/include/asm/uaccess-asm.h

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



#ifndef __ASM_UACCESS_ASM_H__

#define __ASM_UACCESS_ASM_H__



#include <asm/asm-offsets.h>

#include <asm/domain.h>

#include <asm/memory.h>

#include <asm/thread_info.h>



	.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

	sbcscc	\tmp, \tmp, \limit

	bcs	\bad

#ifdef CONFIG_CPU_SPECTRE

	movcs	\addr, #0

	csdb

#endif

#endif

	.endm



	.macro uaccess_mask_range_ptr, addr:req, size:req, limit:req, tmp:req

#ifdef CONFIG_CPU_SPECTRE

	sub	\tmp, \limit, #1

	subs	\tmp, \tmp, \addr	@ tmp = limit - 1 - addr

	addhs	\tmp, \tmp, #1		@ if (tmp >= 0) {

	subshs	\tmp, \tmp, \size	@ tmp = limit - (addr + size) }

	movlo	\addr, #0		@ if (tmp < 0) addr = NULL

	csdb

#endif

	.endm



	.macro	uaccess_disable, tmp, isb=1

#ifdef CONFIG_CPU_SW_DOMAIN_PAN

	/*

	 * Whenever we re-enter userspace, the domains should always be

	 * set appropriately.

	 */

	mov	\tmp, #DACR_UACCESS_DISABLE

	mcr	p15, 0, \tmp, c3, c0, 0		@ Set domain register

	.if	\isb

	instr_sync

	.endif

#endif

	.endm



	.macro	uaccess_enable, tmp, isb=1

#ifdef CONFIG_CPU_SW_DOMAIN_PAN

	/*

	 * Whenever we re-enter userspace, the domains should always be

	 * set appropriately.

	 */

	mov	\tmp, #DACR_UACCESS_ENABLE

	mcr	p15, 0, \tmp, c3, c0, 0

	.if	\isb

	instr_sync

	.endif

#endif

	.endm



#if defined(CONFIG_CPU_SW_DOMAIN_PAN) || defined(CONFIG_CPU_USE_DOMAINS)

#define DACR(x...)	x

#else

#define DACR(x...)

#endif



	/*

	 * Save the address limit on entry to a privileged exception.

	 *

	 * If we are using the DACR for kernel access by the user accessors

	 * (CONFIG_CPU_USE_DOMAINS=y), always reset the DACR kernel domain

	 * back to client mode, whether or not \disable is set.

	 *

	 * If we are using SW PAN, set the DACR user domain to no access

	 * if \disable is set.

	 */

	.macro	uaccess_entry, tsk, tmp0, tmp1, tmp2, disable

	ldr	\tmp1, [\tsk, #TI_ADDR_LIMIT]

	mov	\tmp2, #TASK_SIZE

	str	\tmp2, [\tsk, #TI_ADDR_LIMIT]

 DACR(	mrc	p15, 0, \tmp0, c3, c0, 0)

 DACR(	str	\tmp0, [sp, #SVC_DACR])

	str	\tmp1, [sp, #SVC_ADDR_LIMIT]

	.if \disable && IS_ENABLED(CONFIG_CPU_SW_DOMAIN_PAN)

	/* kernel=client, user=no access */

	mov	\tmp2, #DACR_UACCESS_DISABLE

	mcr	p15, 0, \tmp2, c3, c0, 0

	instr_sync

	.elseif IS_ENABLED(CONFIG_CPU_USE_DOMAINS)

	/* kernel=client */

	bic	\tmp2, \tmp0, #domain_mask(DOMAIN_KERNEL)

	orr	\tmp2, \tmp2, #domain_val(DOMAIN_KERNEL, DOMAIN_CLIENT)

	mcr	p15, 0, \tmp2, c3, c0, 0

	instr_sync

	.endif

	.endm



	/* Restore the user access state previously saved by uaccess_entry */

	.macro	uaccess_exit, tsk, tmp0, tmp1

	ldr	\tmp1, [sp, #SVC_ADDR_LIMIT]

 DACR(	ldr	\tmp0, [sp, #SVC_DACR])

	str	\tmp1, [\tsk, #TI_ADDR_LIMIT]

 DACR(	mcr	p15, 0, \tmp0, c3, c0, 0)

	.endm



#undef DACR



#endif /* __ASM_UACCESS_ASM_H__ */

arch/arm/kernel/atags_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int __init init_atags_procfs(void) 
	size_t size;



	if (tag->hdr.tag != ATAG_CORE) {

		pr_info("No ATAGs?");

		pr_info("No ATAGs?\n");

		return -EINVAL;

	}

arch/arm/kernel/entry-armv.S

+2 −9
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/unistd.h>

#include <asm/tls.h>

#include <asm/system_info.h>

#include <asm/uaccess-asm.h>



#include "entry-header.S"

#include <asm/entry-macro-multi.S>
@@ -179,15 +180,7 @@ ENDPROC(__und_invalid) 
	stmia	r7, {r2 - r6}



	get_thread_info tsk

	ldr	r0, [tsk, #TI_ADDR_LIMIT]

	mov	r1, #TASK_SIZE

	str	r1, [tsk, #TI_ADDR_LIMIT]

	str	r0, [sp, #SVC_ADDR_LIMIT]



	uaccess_save r0

	.if \uaccess

	uaccess_disable r0

	.endif

	uaccess_entry tsk, r0, r1, r2, \uaccess



	.if \trace

#ifdef CONFIG_TRACE_IRQFLAGS

CRA Git | Maintained and supported by SUSTech CRA and CCSE