[v2 PATCH] arm64: kasan: instrument user memory access API
From: mark.rutland@arm.com (Mark Rutland)
Date: 2016-06-06 17:07:59
Also in:
linux-mm, lkml
On Fri, May 27, 2016 at 02:01:03PM -0700, Yang Shi wrote:
quoted hunk ↗ jump to hunk
The upstream commit 1771c6e1a567ea0ba2cccc0a4ffe68a1419fd8ef ("x86/kasan: instrument user memory access API") added KASAN instrument to x86 user memory access API, so added such instrument to ARM64 too. Define __copy_to/from_user in C in order to add kasan_check_read/write call, rename assembly implementation to __arch_copy_to/from_user. Tested by test_kasan module. Signed-off-by: Yang Shi <redacted> --- v2: Adopted the comment from Andrey and Mark to add kasan_check_read/write into __copy_to/from_user. arch/arm64/include/asm/uaccess.h | 25 +++++++++++++++++++++---- arch/arm64/kernel/arm64ksyms.c | 4 ++-- arch/arm64/lib/copy_from_user.S | 4 ++-- arch/arm64/lib/copy_to_user.S | 4 ++-- 4 files changed, 27 insertions(+), 10 deletions(-)diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 0685d74..4dc9a8f 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h@@ -23,6 +23,7 @@ */ #include <linux/string.h> #include <linux/thread_info.h> +#include <linux/kasan-checks.h>
Nit: please move this before the other includes, to keep these ordered alphabetically. Other than that, this looks correct to me, and seems to have addressed the issue from v1. I've given this a spin on v4.7-rc2, with and without CONFIG_UBSAN enabled. So FWIW, with the minor fix above: Reviewed-by: Mark Rutland <mark.rutland@arm.com> Tested-by: Mark Rutland <mark.rutland@arm.com> As this isn't a fix, I assume that this is for Catalin to pick for v4.8. Thanks, Mark.