diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-17 15:22:51 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-21 07:51:35 +0200 |
commit | be03313b615d5557c9c3e0cd5c272d16df2efde0 (patch) | |
tree | ca6a4f58faf8cb8b79aa0778ec7abc33f35e5b6e /lib | |
parent | a1389969db10f65804e766c452a819e173a053dd (diff) | |
download | barebox-be03313b615d5557c9c3e0cd5c272d16df2efde0.tar.gz barebox-be03313b615d5557c9c3e0cd5c272d16df2efde0.tar.xz |
string: Add nokasan variants of default memcpy/memset
Add nokasan variants of __default_memcpy and default_memset.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/string.c | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/lib/string.c b/lib/string.c index 7548fd3581..18ef13dfd8 100644 --- a/lib/string.c +++ b/lib/string.c @@ -491,7 +491,7 @@ char *strswab(const char *s) * * Do not use memset() to access IO space, use memset_io() instead. */ -void *__default_memset(void * s,int c,size_t count) +void *__default_memset(void * s, int c, size_t count) { char *xs = (char *) s; @@ -502,6 +502,17 @@ void *__default_memset(void * s,int c,size_t count) } EXPORT_SYMBOL(__default_memset); +void __no_sanitize_address *__nokasan_default_memset(void * s, int c, size_t count) +{ + char *xs = (char *) s; + + while (count--) + *xs++ = c; + + return s; +} +EXPORT_SYMBOL(__nokasan_default_memset); + #ifndef __HAVE_ARCH_MEMSET void *memset(void *s, int c, size_t count) __alias(__default_memset); #endif @@ -515,7 +526,19 @@ void *memset(void *s, int c, size_t count) __alias(__default_memset); * You should not use this function to access IO space, use memcpy_toio() * or memcpy_fromio() instead. */ -void *__default_memcpy(void * dest,const void *src,size_t count) +void *__default_memcpy(void * dest,const void *src, size_t count) +{ + char *tmp = (char *) dest, *s = (char *) src; + + while (count--) + *tmp++ = *s++; + + return dest; +} +EXPORT_SYMBOL(__default_memcpy); + +void __no_sanitize_address *__nokasan_default_memcpy(void * dest, + const void *src, size_t count) { char *tmp = (char *) dest, *s = (char *) src; @@ -524,7 +547,7 @@ void *__default_memcpy(void * dest,const void *src,size_t count) return dest; } -EXPORT_SYMBOL(memcpy); +EXPORT_SYMBOL(__nokasan_default_memcpy); #ifndef __HAVE_ARCH_MEMCPY void *memcpy(void * dest, const void *src, size_t count) |