Module Name: src
Committed By: maxv
Date: Sat Jan 25 15:55:33 UTC 2020
Modified Files:
src/sys/kern: subr_asan.c subr_msan.c
Log Message:
Actually, uio_vmspace is never NULL, the check should be against
pmap_kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/kern/subr_asan.c
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/subr_msan.c
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.16 src/sys/kern/subr_asan.c:1.17
--- src/sys/kern/subr_asan.c:1.16 Thu Oct 10 13:45:14 2019
+++ src/sys/kern/subr_asan.c Sat Jan 25 15:55:33 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: subr_asan.c,v 1.16 2019/10/10 13:45:14 maxv Exp $ */
+/* $NetBSD: subr_asan.c,v 1.17 2020/01/25 15:55:33 maxv Exp $ */
/*
- * Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.16 2019/10/10 13:45:14 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.17 2020/01/25 15:55:33 maxv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -1077,11 +1077,11 @@ kasan_dma_sync_uio(struct uio *uio, bus_
struct iovec *iov;
int i;
- if (uio->uio_vmspace != NULL)
- return;
-
kasan_shadow_check((uintptr_t)uio, sizeof(struct uio), false, pc);
+ if (!VMSPACE_IS_KERNEL_P(uio->uio_vmspace))
+ return;
+
resid = uio->uio_resid;
iov = uio->uio_iov;
@@ -1233,13 +1233,15 @@ ASAN_SET_SHADOW(f8);
void __asan_poison_stack_memory(const void *, size_t);
void __asan_unpoison_stack_memory(const void *, size_t);
-void __asan_poison_stack_memory(const void *addr, size_t size)
+void
+__asan_poison_stack_memory(const void *addr, size_t size)
{
size = roundup(size, KASAN_SHADOW_SCALE_SIZE);
kasan_shadow_Nbyte_fill(addr, size, KASAN_USE_AFTER_SCOPE);
}
-void __asan_unpoison_stack_memory(const void *addr, size_t size)
+void
+__asan_unpoison_stack_memory(const void *addr, size_t size)
{
kasan_shadow_Nbyte_markvalid(addr, size);
}
Index: src/sys/kern/subr_msan.c
diff -u src/sys/kern/subr_msan.c:1.5 src/sys/kern/subr_msan.c:1.6
--- src/sys/kern/subr_msan.c:1.5 Sun Dec 8 11:53:54 2019
+++ src/sys/kern/subr_msan.c Sat Jan 25 15:55:33 2020
@@ -1,7 +1,7 @@
-/* $NetBSD: subr_msan.c,v 1.5 2019/12/08 11:53:54 maxv Exp $ */
+/* $NetBSD: subr_msan.c,v 1.6 2020/01/25 15:55:33 maxv Exp $ */
/*
- * Copyright (c) 2019 The NetBSD Foundation, Inc.
+ * Copyright (c) 2019-2020 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.5 2019/12/08 11:53:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.6 2020/01/25 15:55:33 maxv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -1538,7 +1538,7 @@ kmsan_dma_sync_uio(struct uio *uio, bus_
struct iovec *iov;
int i;
- if (uio->uio_vmspace != NULL)
+ if (!VMSPACE_IS_KERNEL_P(uio->uio_vmspace))
return;
resid = uio->uio_resid;
