Patch "treewide: Remove stringification from __alias macro definition"
causes arguments to __alias to no longer be quoted automatically, which
breaks CONFIG_KASAN on ARM after commit d6d51a96c7d6 ("ARM: 9014/2:
Replace string mem* functions for KASan"):
arch/arm/boot/compressed/string.c:24:1: error: attribute 'alias' argument not a
string
24 | void *__memcpy(void *__dest, __const void *__src, size_t __n)
__alias(memcpy);
| ^~~~
arch/arm/boot/compressed/string.c:25:1: error: attribute 'alias' argument not a
string
25 | void *__memmove(void *__dest, __const void *__src, size_t count)
__alias(memmove);
| ^~~~
arch/arm/boot/compressed/string.c:26:1: error: attribute 'alias' argument not a
string
26 | void *__memset(void *s, int c, size_t count) __alias(memset);
| ^~~~
make[3]: *** [scripts/Makefile.build:283: arch/arm/boot/compressed/string.o]
Error 1
Quote the names like the treewide patch does so there is no more error.
Reported-by: Naresh Kamboju <[email protected]>
Reported-by: Valdis Klētnieks <[email protected]>
Signed-off-by: Nathan Chancellor <[email protected]>
---
Hi Andrew,
Stephen said I should send this along to you so that it can be applied
as part of the post -next series. Please let me know if you need any
more information or clarification, I tried to document it succinctly in
the commit message.
Cheers,
Nathan
arch/arm/boot/compressed/string.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/compressed/string.c
b/arch/arm/boot/compressed/string.c
index 8c0fa276d994..cc6198f8a348 100644
--- a/arch/arm/boot/compressed/string.c
+++ b/arch/arm/boot/compressed/string.c
@@ -21,9 +21,9 @@
#undef memcpy
#undef memmove
#undef memset
-void *__memcpy(void *__dest, __const void *__src, size_t __n) __alias(memcpy);
-void *__memmove(void *__dest, __const void *__src, size_t count)
__alias(memmove);
-void *__memset(void *s, int c, size_t count) __alias(memset);
+void *__memcpy(void *__dest, __const void *__src, size_t __n)
__alias("memcpy");
+void *__memmove(void *__dest, __const void *__src, size_t count)
__alias("memmove");
+void *__memset(void *s, int c, size_t count) __alias("memset");
#endif
void *memcpy(void *__dest, __const void *__src, size_t __n)
--
2.29.2
