Merge pull request #587 from lrh2000/undef-strings

lkl: Define symbols for string utilities

Author: tavip

arch/lkl/Makefile

@@ -61,6 +61,7 @@ LKL_ENTRY_POINTS += \
 endif
 
 core-y += arch/lkl/kernel/
+core-y += arch/lkl/lib/
 core-y += arch/lkl/mm/
 core-y += arch/lkl/drivers/
 

arch/lkl/include/asm/string.h

@@ -8,6 +8,7 @@
 /* use __mem* names to avoid conflict with KASAN's mem* functions. */
 
 #define __HAVE_ARCH_MEMCPY
+extern void *memcpy(void *dest, const void *src, size_t count);
 static inline void *__memcpy(void *dest, const void *src, size_t count)
 {
 	char *tmp = dest;
@@ -24,6 +25,7 @@ static inline void *__memcpy(void *dest, const void *src, size_t count)
 }
 
 #define __HAVE_ARCH_MEMSET
+extern void *memset(void *s, int c, size_t count);
 static inline void *__memset(void *s, int c, size_t count)
 {
 	char *xs = s;
@@ -39,6 +41,7 @@ static inline void *__memset(void *s, int c, size_t count)
 }
 
 #define __HAVE_ARCH_MEMMOVE
+extern void *memmove(void *dest, const void *src, size_t count);
 static inline void *__memmove(void *dest, const void *src, size_t count)
 {
 	char *tmp;
@@ -86,9 +89,6 @@ static inline void *__memmove(void *dest, const void *src, size_t count)
 #undef memcpy
 #undef memset
 #undef memmove
-extern void *memset(void *dst, int c, __kernel_size_t count);
-extern void *memcpy(void *dst, const void *src, __kernel_size_t count);
-extern void *memmove(void *dest, const void *src, size_t count);
 
 #endif /* __SANITIZE_ADDRESS__ */
 

arch/lkl/lib/Makefile

@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-y += string.o

arch/lkl/lib/string.c

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/string.h>
+#include <linux/export.h>
+
+#if !defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX)
+/*
+ * If CONFIG_KASAN_GENERIC is on but CONFIG_CC_HAS_KASAN_MEMINTRINSIC_PREFIX is
+ * off, mm/kasan/shadow.c will define the kasan version memcpy and its friends
+ * for us. We should not do anything, otherwise the symbols will conflict.
+ */
+
+#undef memcpy
+#undef memset
+#undef memmove
+
+__visible void *memcpy(void *dest, const void *src, size_t count)
+{
+	return __memcpy(dest, src, count);
+}
+EXPORT_SYMBOL(memcpy);
+
+__visible void *memset(void *s, int c, size_t count)
+{
+	return __memset(s, c, count);
+}
+EXPORT_SYMBOL(memset);
+
+__visible void *memmove(void *dest, const void *src, size_t count)
+{
+	return __memmove(dest, src, count);
+}
+EXPORT_SYMBOL(memmove);
+
+#endif