diff options
| author | Vasily Gorbik | 2019-04-23 15:36:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-19 08:18:01 +0200 |
| commit | fcc1ce5b4f42b4de3a8313bd9aacce39c60215d1 (patch) | |
| tree | 9301972de2f84f98350f32bdd05409984e8a592f /arch/s390 | |
| parent | Revert "ALSA: seq: Protect in-kernel ioctl calls with mutex" (diff) | |
| download | kernel-qcow2-linux-fcc1ce5b4f42b4de3a8313bd9aacce39c60215d1.tar.gz kernel-qcow2-linux-fcc1ce5b4f42b4de3a8313bd9aacce39c60215d1.tar.xz kernel-qcow2-linux-fcc1ce5b4f42b4de3a8313bd9aacce39c60215d1.zip | |
s390/kasan: fix strncpy_from_user kasan checks
[ Upstream commit 01eb42afb45719cb41bb32c278e068073738899d ]
arch/s390/lib/uaccess.c is built without kasan instrumentation. Kasan
checks are performed explicitly in copy_from_user/copy_to_user
functions. But since those functions could be inlined, calls from
files like uaccess.c with instrumentation disabled won't generate
kasan reports. This is currently the case with strncpy_from_user
function which was revealed by newly added kasan test. Avoid inlining of
copy_from_user/copy_to_user when the kernel is built with kasan support
to make sure kasan checks are fully functional.
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/uaccess.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h index ad6b91013a05..5332f628c1ed 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h @@ -56,8 +56,10 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long n); unsigned long __must_check raw_copy_to_user(void __user *to, const void *from, unsigned long n); +#ifndef CONFIG_KASAN #define INLINE_COPY_FROM_USER #define INLINE_COPY_TO_USER +#endif #ifdef CONFIG_HAVE_MARCH_Z10_FEATURES |