From 467e3b98ecad1c99d98640723d35e01bd76795bd Mon Sep 17 00:00:00 2001 From: maxv Date: Sat, 22 Feb 2020 20:08:39 +0000 Subject: [PATCH] Be less strict: when copyinstr() returns ENAMETOOLONG, it does initialize the buffer, so mark it as such. --- sys/kern/subr_msan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index eedc362bcde7..efdf1de4be9a 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -1,4 +1,4 @@ -/* $NetBSD: subr_msan.c,v 1.7 2020/01/31 08:26:10 maxv Exp $ */ +/* $NetBSD: subr_msan.c,v 1.8 2020/02/22 20:08:39 maxv Exp $ */ /* * Copyright (c) 2019-2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.7 2020/01/31 08:26:10 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.8 2020/02/22 20:08:39 maxv Exp $"); #include #include @@ -885,7 +885,7 @@ kmsan_copyinstr(const void *uaddr, void *kaddr, size_t len, size_t *done) kmsan_check_arg(sizeof(uaddr) + sizeof(kaddr) + sizeof(len) + sizeof(done), "copyinstr():args"); ret = copyinstr(uaddr, kaddr, len, &_done); - if (ret == 0) + if (ret == 0 || ret == ENAMETOOLONG) kmsan_shadow_fill(kaddr, KMSAN_STATE_INITED, _done); if (done != NULL) { *done = _done;