Module Name: src
Committed By: pgoyette
Date: Fri Jan 26 22:54:33 UTC 2018
Modified Files:
src/sys/kern: kern_sysctl.c
Log Message:
Bounds checking - CID/1428650
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/kern/kern_sysctl.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_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.259 src/sys/kern/kern_sysctl.c:1.260
--- src/sys/kern/kern_sysctl.c:1.259 Tue Apr 25 22:07:10 2017
+++ src/sys/kern/kern_sysctl.c Fri Jan 26 22:54:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.259 2017/04/25 22:07:10 pgoyette Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.260 2018/01/26 22:54:33 pgoyette Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.259 2017/04/25 22:07:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.260 2018/01/26 22:54:33 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_defcorename.h"
@@ -2415,6 +2415,8 @@ sysctl_log_add(struct sysctllog **logp,
const struct sysctlnode *pnode;
struct sysctllog *log;
+ KASSERT(namelen < CTL_MAXNAME);
+
if (node->sysctl_flags & CTLFLAG_PERMANENT)
return (0);
@@ -2476,7 +2478,7 @@ sysctl_log_add(struct sysctllog **logp,
* stuff name in, then namelen, then node type, and finally,
* the version for non-node nodes.
*/
- for (i = 0; i < namelen; i++)
+ for (i = 0; i < namelen && i < CTL_MAXNAME; i++)
log->log_num[--log->log_left] = name[i];
log->log_num[--log->log_left] = namelen;
log->log_num[--log->log_left] = SYSCTL_TYPE(node->sysctl_flags);
