Module Name: src
Committed By: martin
Date: Mon Nov 12 08:56:15 UTC 2018
Modified Files:
src/sys/kern [netbsd-8]: kern_proc.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1088):
sys/kern/kern_proc.c: revision 1.219 (via patch)
Fix buffer overflow, which can lead to severe information leak. Detected
by kASan.
To generate a diff of this commit:
cvs rdiff -u -r1.206.6.4 -r1.206.6.5 src/sys/kern/kern_proc.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_proc.c
diff -u src/sys/kern/kern_proc.c:1.206.6.4 src/sys/kern/kern_proc.c:1.206.6.5
--- src/sys/kern/kern_proc.c:1.206.6.4 Mon Apr 16 13:31:33 2018
+++ src/sys/kern/kern_proc.c Mon Nov 12 08:56:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.206.6.4 2018/04/16 13:31:33 martin Exp $ */
+/* $NetBSD: kern_proc.c,v 1.206.6.5 2018/11/12 08:56:15 martin Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.206.6.4 2018/04/16 13:31:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.206.6.5 2018/11/12 08:56:15 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -2461,7 +2461,8 @@ fill_pathname(struct lwp *l, pid_t pid,
len = strlen(path) + 1;
if (oldp != NULL) {
- error = sysctl_copyout(l, path, oldp, *oldlenp);
+ size_t copylen = min(len, *oldlenp);
+ error = sysctl_copyout(l, path, oldp, copylen);
if (error == 0 && *oldlenp < len)
error = ENOSPC;
}
