kevin/linux
1
Fork 0
Code

string: use __builtin_memcpy() in strlcpy/strlcat

Browse Source 
lib/string.c is built with -ffreestanding, which prevents the compiler
from replacing certain functions with calls to their library versions.

On the other hand, this also prevents Clang and GCC from instrumenting
calls to memcpy() when building with KASAN, KCSAN or KMSAN:
 - KASAN normally replaces memcpy() with __asan_memcpy() with the
   additional cc-param,asan-kernel-mem-intrinsic-prefix=1;
 - KCSAN and KMSAN replace memcpy() with __tsan_memcpy() and
   __msan_memcpy() by default.

To let the tools catch memory accesses from strlcpy/strlcat, replace
the calls to memcpy() with __builtin_memcpy(), which KASAN, KCSAN and
KMSAN are able to replace even in -ffreestanding mode.

This preserves the behavior in normal builds (__builtin_memcpy() ends up
being replaced with memcpy()), and does not introduce new instrumentation
in unwanted places, as strlcpy/strlcat are already instrumented.

Suggested-by: Marco Elver <elver@google.com>
Signed-off-by: Alexander Potapenko <glider@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Link: https://lore.kernel.org/all/20230224085942.1791837-1-elver@google.com/
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230530083911.1104336-1-glider@google.com
This commit is contained in:
Alexander Potapenko 2023-05-30 10:39:11 +02:00 committed by Kees Cook
parent 2af4aa3be5
commit f9cfb1910e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/string.c
View File

@ -110,7 +110,7 @@ size_t strlcpy(char *dest, const char *src, size_t size)
if (size) { if (size) {
size_t len = (ret >= size) ? size - 1 : ret; size_t len = (ret >= size) ? size - 1 : ret;
memcpy(dest, src, len); __builtin_memcpy(dest, src, len);
dest[len] = '\0'; dest[len] = '\0';
} }
return ret; return ret;
@ -260,7 +260,7 @@ size_t strlcat(char *dest, const char *src, size_t count)
count -= dsize; count -= dsize;
if (len >= count) if (len >= count)
len = count-1; len = count-1;
memcpy(dest, src, len); __builtin_memcpy(dest, src, len);
dest[len] = 0; dest[len] = 0;
return res; return res;
} }