修改内核路径

hc

2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b

 kernel/arch/powerpc/include/asm/string.h
..
..
@@ -4,14 +4,17 @@
4
4
 
5
5
 #ifdef __KERNEL__
6
6
 
7
+#ifndef CONFIG_KASAN
7
8
 #define __HAVE_ARCH_STRNCPY
8
9
 #define __HAVE_ARCH_STRNCMP
10
+#define __HAVE_ARCH_MEMCHR
11
+#define __HAVE_ARCH_MEMCMP
12
+#define __HAVE_ARCH_MEMSET16
13
+#endif
14
+
9
15
 #define __HAVE_ARCH_MEMSET
10
16
 #define __HAVE_ARCH_MEMCPY
11
17
 #define __HAVE_ARCH_MEMMOVE
12
-#define __HAVE_ARCH_MEMCMP
13
-#define __HAVE_ARCH_MEMCHR
14
-#define __HAVE_ARCH_MEMSET16
15
18
 #define __HAVE_ARCH_MEMCPY_FLUSHCACHE
16
19
 
17
20
 extern char * strcpy(char *,const char *);
..
..
@@ -25,9 +28,29 @@
25
28
 extern void * memmove(void *,const void *,__kernel_size_t);
26
29
 extern int memcmp(const void *,const void *,__kernel_size_t);
27
30
 extern void * memchr(const void *,int,__kernel_size_t);
28
-extern void * memcpy_flushcache(void *,const void *,__kernel_size_t);
31
+void memcpy_flushcache(void *dest, const void *src, size_t size);
32
+
33
+void *__memset(void *s, int c, __kernel_size_t count);
34
+void *__memcpy(void *to, const void *from, __kernel_size_t n);
35
+void *__memmove(void *to, const void *from, __kernel_size_t n);
36
+
37
+#if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__)
38
+/*
39
+ * For files that are not instrumented (e.g. mm/slub.c) we
40
+ * should use not instrumented version of mem* functions.
41
+ */
42
+#define memcpy(dst, src, len) __memcpy(dst, src, len)
43
+#define memmove(dst, src, len) __memmove(dst, src, len)
44
+#define memset(s, c, n) __memset(s, c, n)
45
+
46
+#ifndef __NO_FORTIFY
47
+#define __NO_FORTIFY /* FORTIFY_SOURCE uses __builtin_memcpy, etc. */
48
+#endif
49
+
50
+#endif
29
51
 
30
52
 #ifdef CONFIG_PPC64
53
+#ifndef CONFIG_KASAN
31
54
 #define __HAVE_ARCH_MEMSET32
32
55
 #define __HAVE_ARCH_MEMSET64
33
56
 
..
..
@@ -49,8 +72,11 @@
49
72
 {
50
73
 	return __memset64(p, v, n * 8);
51
74
 }
75
+#endif
52
76
 #else
77
+#ifndef CONFIG_KASAN
53
78
 #define __HAVE_ARCH_STRLEN
79
+#endif
54
80
 
55
81
 extern void *memset16(uint16_t *, uint16_t, __kernel_size_t);
56
82
 #endif