Module Name: src
Committed By: maxv
Date: Thu Apr 11 17:43:45 UTC 2019
Modified Files:
src/sys/kern: subr_asan.c
src/sys/sys: systm.h
Log Message:
Add KASAN instrumentation for copyin/copyinstr/copyoutstr. No copyout for
now, because mm.c needs whitelisting.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/subr_asan.c
cvs rdiff -u -r1.282 -r1.283 src/sys/sys/systm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_asan.c
diff -u src/sys/kern/subr_asan.c:1.6 src/sys/kern/subr_asan.c:1.7
--- src/sys/kern/subr_asan.c:1.6 Sun Apr 7 09:20:04 2019
+++ src/sys/kern/subr_asan.c Thu Apr 11 17:43:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_asan.c,v 1.6 2019/04/07 09:20:04 maxv Exp $ */
+/* $NetBSD: subr_asan.c,v 1.7 2019/04/11 17:43:45 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.6 2019/04/07 09:20:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.7 2019/04/11 17:43:45 maxv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -479,6 +479,38 @@ kasan_strlen(const char *str)
return (s - str);
}
+#undef copyinstr
+#undef copyoutstr
+#undef copyin
+
+int kasan_copyinstr(const void *, void *, size_t, size_t *);
+int kasan_copyoutstr(const void *, void *, size_t, size_t *);
+int kasan_copyin(const void *, void *, size_t);
+int copyinstr(const void *, void *, size_t, size_t *);
+int copyoutstr(const void *, void *, size_t, size_t *);
+int copyin(const void *, void *, size_t);
+
+int
+kasan_copyin(const void *uaddr, void *kaddr, size_t len)
+{
+ kasan_shadow_check((unsigned long)kaddr, len, true, __RET_ADDR);
+ return copyin(uaddr, kaddr, len);
+}
+
+int
+kasan_copyinstr(const void *uaddr, void *kaddr, size_t len, size_t *done)
+{
+ kasan_shadow_check((unsigned long)kaddr, len, true, __RET_ADDR);
+ return copyinstr(uaddr, kaddr, len, done);
+}
+
+int
+kasan_copyoutstr(const void *kaddr, void *uaddr, size_t len, size_t *done)
+{
+ kasan_shadow_check((unsigned long)kaddr, len, false, __RET_ADDR);
+ return copyoutstr(kaddr, uaddr, len, done);
+}
+
/* -------------------------------------------------------------------------- */
void __asan_register_globals(struct __asan_global *, size_t);
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.282 src/sys/sys/systm.h:1.283
--- src/sys/sys/systm.h:1.282 Sat Apr 6 03:06:28 2019
+++ src/sys/sys/systm.h Thu Apr 11 17:43:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.282 2019/04/06 03:06:28 thorpej Exp $ */
+/* $NetBSD: systm.h,v 1.283 2019/04/11 17:43:45 maxv Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -269,9 +269,18 @@ int kcopy(const void *, void *, size_t);
#endif /* KERNEL */
int copystr(const void *, void *, size_t, size_t *);
+#if defined(_KERNEL) && defined(KASAN)
+int kasan_copyinstr(const void *, void *, size_t, size_t *);
+int kasan_copyoutstr(const void *, void *, size_t, size_t *);
+int kasan_copyin(const void *, void *, size_t);
+#define copyinstr kasan_copyinstr
+#define copyoutstr kasan_copyoutstr
+#define copyin kasan_copyin
+#else
int copyinstr(const void *, void *, size_t, size_t *);
int copyoutstr(const void *, void *, size_t, size_t *);
int copyin(const void *, void *, size_t);
+#endif
int copyout(const void *, void *, size_t);
#ifdef KLEAK
