x86-fortify-kmsan-fix-kmsan-fortify-builds.patch removed from -mm tree
The quilt patch titled
Subject: x86: fortify: kmsan: fix KMSAN fortify builds
has been removed from the -mm tree. Its filename was
x86-fortify-kmsan-fix-kmsan-fortify-builds.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Alexander Potapenko <[email protected]>
Subject: x86: fortify: kmsan: fix KMSAN fortify builds
Date: Mon, 24 Oct 2022 23:21:44 +0200
Ensure that KMSAN builds replace memset/memcpy/memmove calls with the respective __msan_XXX functions, and that none of the macros are redefined twice. This should allow building kernel with both CONFIG_KMSAN and CONFIG_FORTIFY_SOURCE.
---
arch/x86/include/asm/string_64.h renamed from arch/x86/include/asm/string_64.h~x86-fortify-kmsan-fix-kmsan-fortify-builds +7 -4
@@ -10,10 +10,13 @@/* Even with __builtin_ the compiler may decide to use the out of line function. */ +#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY) +#include <linux/kmsan_string.h> +#endif +#define __HAVE_ARCH_MEMCPY 1 -#if defined(__SANITIZE_MEMORY__) +#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY)#undef memcpy -void *__msan_memcpy (void *dst,const void *src,size_t size);#define memcpy __msan_memcpy#else extern void *memcpy (void *to,const void *from,size_t len);
@@ -21,7 +24,7 @@ extern void *memcpy(void *to, const voidextern void *__memcpy (void *to,const void *from,size_t len);#define __HAVE_ARCH_MEMSET -#if defined(__SANITIZE_MEMORY__) +#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY)extern void *__msan_memset (void *s,int c,size_t n);#undef memset#define memset __msan_memset
@@ -67,7 +70,7 @@ static inline void *memset64(uint64_t *s }#define __HAVE_ARCH_MEMMOVE -#if defined(__SANITIZE_MEMORY__) +#if defined(__SANITIZE_MEMORY__) && defined(__NO_FORTIFY)#undef memmovevoid *__msan_memmove (void *dest,const void *src,size_t len);#define memmove __msan_memmove
include/linux/fortify-string.h renamed from include/linux/fortify-string.h~x86-fortify-kmsan-fix-kmsan-fortify-builds +15 -2
@@ -43,11 +43,24 @@ extern __kernel_size_t __underlying_strlextern char *__underlying_strncat (char *p,const char *q,__kernel_size_t count)__RENAME (strncat);extern char *__underlying_strncpy (char *p,const char *q,__kernel_size_t size)__RENAME (strncpy);#else -#define __underlying_memchr __builtin_memchr -#define __underlying_memcmp __builtin_memcmp + +#if defined(__SANITIZE_MEMORY__) +/* +* For KMSAN builds all memcpy/memset/memmove calls should be replaced by the +* corresponding __msan_XXX functions. +*/ +#include <linux/kmsan_string.h> +#define __underlying_memcpy __msan_memcpy +#define __underlying_memmove __msan_memmove +#define __underlying_memset __msan_memset +#else #define __underlying_memcpy __builtin_memcpy#define __underlying_memmove __builtin_memmove#define __underlying_memset __builtin_memset +#endif + +#define __underlying_memchr __builtin_memchr +#define __underlying_memcmp __builtin_memcmp#define __underlying_strcat __builtin_strcat#define __underlying_strcpy __builtin_strcpy#define __underlying_strlen __builtin_strlen
include/linux/kmsan_string.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* KMSAN string functions API used in other headers. +* +* Copyright (C) 2022 Google LLC +* Author: Alexander Potapenko <[email protected]> +* +*/ +#ifndef _LINUX_KMSAN_STRING_H +#define _LINUX_KMSAN_STRING_H + +/* +* KMSAN overrides the default memcpy/memset/memmove implementations in the +* kernel, which requires having __msan_XXX function prototypes in several other +* headers. Keep them in one place instead of open-coding. +*/ +void *__msan_memcpy (void *dst,const void *src,size_t size); +void *__msan_memset (void *s,int c,size_t n); +void *__msan_memmove (void *dest,const void *src,size_t len); + +#endif /* _LINUX_KMSAN_STRING_H */
mm/kmsan/instrumentation.c renamed from mm/kmsan/instrumentation.c~x86-fortify-kmsan-fix-kmsan-fortify-builds +1 -0
@@ -14,6 +14,7 @@#include "kmsan.h" #include <linux/gfp.h> +#include <linux/kmsan_string.h> #include <linux/mm.h> #include <linux/uaccess.h>
_
Patches currently in -mm which might be from [email protected] are