mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
x86: kasan: kmsan: support CONFIG_GENERIC_CSUM on x86, enable it for KASAN/KMSAN
This is needed to allow memory tools like KASAN and KMSAN see the memory accesses from the checksum code. Without CONFIG_GENERIC_CSUM the tools can't see memory accesses originating from handwritten assembly code. For KASAN it's a question of detecting more bugs, for KMSAN using the C implementation also helps avoid false positives originating from seemingly uninitialized checksum values. Link: https://lkml.kernel.org/r/20220915150417.722975-38-glider@google.com Signed-off-by: Alexander Potapenko <glider@google.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Andrey Konovalov <andreyknvl@google.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Borislav Petkov <bp@alien8.de> Cc: Christoph Hellwig <hch@lst.de> Cc: Christoph Lameter <cl@linux.com> Cc: David Rientjes <rientjes@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Eric Biggers <ebiggers@google.com> Cc: Eric Biggers <ebiggers@kernel.org> Cc: Eric Dumazet <edumazet@google.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Ilya Leoshkevich <iii@linux.ibm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Kees Cook <keescook@chromium.org> Cc: Marco Elver <elver@google.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Petr Mladek <pmladek@suse.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Vegard Nossum <vegard.nossum@oracle.com> Cc: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
3f1e2c7a90
commit
d911c67e10
3 changed files with 16 additions and 6 deletions
|
@ -325,6 +325,10 @@ config GENERIC_ISA_DMA
|
||||||
def_bool y
|
def_bool y
|
||||||
depends on ISA_DMA_API
|
depends on ISA_DMA_API
|
||||||
|
|
||||||
|
config GENERIC_CSUM
|
||||||
|
bool
|
||||||
|
default y if KMSAN || KASAN
|
||||||
|
|
||||||
config GENERIC_BUG
|
config GENERIC_BUG
|
||||||
def_bool y
|
def_bool y
|
||||||
depends on BUG
|
depends on BUG
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
#ifdef CONFIG_GENERIC_CSUM
|
||||||
|
# include <asm-generic/checksum.h>
|
||||||
|
#else
|
||||||
# define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER 1
|
# define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER 1
|
||||||
# define HAVE_CSUM_COPY_USER
|
# define HAVE_CSUM_COPY_USER
|
||||||
# define _HAVE_ARCH_CSUM_AND_COPY
|
# define _HAVE_ARCH_CSUM_AND_COPY
|
||||||
|
@ -7,3 +10,4 @@
|
||||||
# else
|
# else
|
||||||
# include <asm/checksum_64.h>
|
# include <asm/checksum_64.h>
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
|
@ -65,7 +65,9 @@ ifneq ($(CONFIG_X86_CMPXCHG64),y)
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
obj-y += iomap_copy_64.o
|
obj-y += iomap_copy_64.o
|
||||||
|
ifneq ($(CONFIG_GENERIC_CSUM),y)
|
||||||
lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o
|
lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o
|
||||||
|
endif
|
||||||
lib-y += clear_page_64.o copy_page_64.o
|
lib-y += clear_page_64.o copy_page_64.o
|
||||||
lib-y += memmove_64.o memset_64.o
|
lib-y += memmove_64.o memset_64.o
|
||||||
lib-y += copy_user_64.o
|
lib-y += copy_user_64.o
|
||||||
|
|
Loading…
Reference in a new issue