diff --git a/arch/arm64/include/asm/string.h b/arch/arm64/include/asm/string.h
index 08e0327a1719ed1a6817c4aefc5b8e1f678cb647..c12a3ca42d61ac86b76fc93220ec3801d37e8b97 100644
--- a/arch/arm64/include/asm/string.h
+++ b/arch/arm64/include/asm/string.h
@@ -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);
diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 6c8fa5aed54cb02b92a2aa648649e697dbcd5474..b273b362034fbeb572ffd60000604d35bde2e0ab 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -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.