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

!367 [sync] PR-354: [OLK-5.10] machine check safe review issue modification 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/354 
 
https://gitee.com/openeuler/kernel/issues/I6AQE8 
 
Link:https://gitee.com/openeuler/kernel/pulls/367

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 4a86ab38 5c7133b4

arch/arm64/include/asm/string.h

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ extern void *memcpy(void *, const void *, __kernel_size_t); 
extern void *__memcpy(void *, const void *, __kernel_size_t);



#define __HAVE_ARCH_MEMCPY_MC

extern unsigned long *memcpy_mcs(void *, const void *, __kernel_size_t);

extern unsigned long *__memcpy_mcs(void *, const void *, __kernel_size_t);

extern unsigned long memcpy_mcs(void *, const void *, __kernel_size_t);

extern unsigned long __memcpy_mcs(void *, const void *, __kernel_size_t);



#define __HAVE_ARCH_MEMMOVE

extern void *memmove(void *, const void *, __kernel_size_t);

mm/kasan/common.c

+12 −0
Original line number Diff line number Diff line
@@ -109,6 +109,18 @@ void *memcpy(void *dest, const void *src, size_t len) 
	return __memcpy(dest, src, len);

}



#ifdef __HAVE_ARCH_MEMCPY_MC

#undef memcpy_mcs

unsigned long memcpy_mcs(void *dest, const void *src, size_t len)

{

	if (!check_memory_region((unsigned long)src, len, false, _RET_IP_) ||

	    !check_memory_region((unsigned long)dest, len, true, _RET_IP_))

		return (unsigned long)len;



	return __memcpy_mcs(dest, src, len);

}

#endif



/*

 * Poisons the shadow memory for 'size' bytes starting from 'addr'.

 * Memory addresses should be aligned to KASAN_SHADOW_SCALE_SIZE.