Unverified Commit 39170388 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8203 efi/libstub: arm64: Add macro isolation memmap detection code 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cui GaoSheng <cuigaosheng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZFIIIDPMQT5XB7UBFCY5BKGYLIJKB6CQ/ 
 
https://gitee.com/openeuler/kernel/issues/I9K8D1 
 
Link:https://gitee.com/openeuler/kernel/pulls/8203

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents aedbc5c2 affea797

arch/arm64/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -2111,6 +2111,16 @@ config RANDOMIZE_MODULE_REGION_FULL 
	  a limited range that contains the [_stext, _etext] interval of the

	  core kernel, so branch relocations are always in range.



config UEFI_KASLR_SKIP_MEMMAP

	bool "Skip the memmap address when randomize the kernel image"

	depends on RANDOMIZE_BASE

	default n

	help

	  In some cases we hopes to reserve memory by memmap for other

	  features, the reserved memory may conflict with the kernel

	  image, so we need skip the memmap reserved memory when randomize

	  the kernel image to avoid it.



config CC_HAVE_STACKPROTECTOR_SYSREG

	def_bool $(cc-option,-mstack-protector-guard=sysreg -mstack-protector-guard-reg=sp_el0 -mstack-protector-guard-offset=0)

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ CONFIG_ARM64_PSEUDO_NMI=y 
CONFIG_RELOCATABLE=y

CONFIG_RANDOMIZE_BASE=y

CONFIG_RANDOMIZE_MODULE_REGION_FULL=y

CONFIG_UEFI_KASLR_SKIP_MEMMAP=y

CONFIG_NOKASLR_MEM_RANGE=y

CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y

CONFIG_STACKPROTECTOR_PER_TASK=y

arch/arm64/kernel/image-vars.h

+2 −0
Original line number Diff line number Diff line
@@ -32,7 +32,9 @@ __efistub_strnlen = __pi_strnlen; 
__efistub_strcmp		= __pi_strcmp;

__efistub_strncmp		= __pi_strncmp;

__efistub_strrchr		= __pi_strrchr;

#if defined(CONFIG_UEFI_KASLR_SKIP_MEMMAP) || defined(CONFIG_NOKASLR_MEM_RANGE)

__efistub_strchr		= __pi_strchr;

#endif

__efistub___clean_dcache_area_poc = __pi___clean_dcache_area_poc;



__efistub__text			= _text;

arch/arm64/lib/strchr.S

+8 −0
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ 
 * Returns:

 *	x0 - address of first occurrence of 'c' or 0

 */

#if defined(CONFIG_UEFI_KASLR_SKIP_MEMMAP) || defined(CONFIG_NOKASLR_MEM_RANGE)

SYM_FUNC_START_WEAK_PI(strchr)

#else

SYM_FUNC_START_WEAK(strchr)

#endif

	and	w1, w1, #0xff

1:	ldrb	w2, [x0], #1

	cmp	w2, w1
@@ -28,5 +32,9 @@ SYM_FUNC_START_WEAK_PI(strchr) 
	cmp	w2, w1

	csel	x0, x0, xzr, eq

	ret

#if defined(CONFIG_UEFI_KASLR_SKIP_MEMMAP) || defined(CONFIG_NOKASLR_MEM_RANGE)

SYM_FUNC_END_PI(strchr)

#else

SYM_FUNC_END(strchr)

#endif

EXPORT_SYMBOL_NOKASAN(strchr)

drivers/firmware/efi/libstub/arm64-stub.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include "efistub.h"



#ifdef CONFIG_UEFI_KASLR_SKIP_MEMMAP

#define MAX_MEMMAP_REGIONS 32



struct mem_vector {
@@ -103,6 +104,7 @@ void free_avoid_memmap(void) 
		efi_free(mem_avoid[i].size, mem_avoid[i].start);

	}

}

#endif



#ifdef CONFIG_NOKASLR_MEM_RANGE

#define MAX_MEM_NOKASLR_REGIONS 4