Module Name: src
Committed By: riastradh
Date: Mon Jun 27 03:56:37 UTC 2022
Modified Files:
src/sys/kern: kern_ktrace.c
Log Message:
ktrace(9): Make sure ktrkuser initializes the full ktr_id member.
strlcpy does not; strncpy does. However, the member must be
NUL-terminated, because kdump uses it, e.g., with printf("%s"), so
expicitly set the last byte to NUL.
Possible fix for a host of sanitizer complaints in syzkaller.
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/kern/kern_ktrace.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/kern_ktrace.c
diff -u src/sys/kern/kern_ktrace.c:1.179 src/sys/kern/kern_ktrace.c:1.180
--- src/sys/kern/kern_ktrace.c:1.179 Sat Mar 12 17:45:53 2022
+++ src/sys/kern/kern_ktrace.c Mon Jun 27 03:56:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ktrace.c,v 1.179 2022/03/12 17:45:53 riastradh Exp $ */
+/* $NetBSD: kern_ktrace.c,v 1.180 2022/06/27 03:56:37 riastradh Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.179 2022/03/12 17:45:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.180 2022/06/27 03:56:37 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -950,7 +950,8 @@ ktr_kuser(const char *id, const void *ad
if (error != 0)
return;
- strlcpy(ktp->ktr_id, id, KTR_USER_MAXIDLEN);
+ strncpy(ktp->ktr_id, id, KTR_USER_MAXIDLEN - 1);
+ ktp->ktr_id[KTR_USER_MAXIDLEN - 1] = '\0';
memcpy(ktp + 1, addr, len);
