Module Name: src
Committed By: martin
Date: Fri Sep 20 09:36:13 UTC 2024
Modified Files:
src/sys/kern [netbsd-10]: kern_sysctl.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #870):
sys/kern/kern_sysctl.c: revision 1.267
sys/kern/kern_sysctl.c: revision 1.268
Trailing whitespace
Fix SYSCTL_DEBUG_CREATE for non-x86 by using copyin
To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.266.20.1 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.266 src/sys/kern/kern_sysctl.c:1.266.20.1
--- src/sys/kern/kern_sysctl.c:1.266 Thu Aug 27 14:11:57 2020
+++ src/sys/kern/kern_sysctl.c Fri Sep 20 09:36:13 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.266 2020/08/27 14:11:57 riastradh Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.266.20.1 2024/09/20 09:36:13 martin Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
#define __COMPAT_SYSCTL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.266 2020/08/27 14:11:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.266.20.1 2024/09/20 09:36:13 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_defcorename.h"
@@ -203,7 +203,7 @@ sysctl_copyout(struct lwp *l, const void
} else {
error = kcopy(kaddr, uaddr, len);
}
-
+
return error;
}
@@ -1228,9 +1228,16 @@ int
sysctl_create(SYSCTLFN_ARGS)
{
const struct sysctlnode *node;
- int k, rc, ni, nl = namelen + (name - oname);
+ int k, v, rc, ni, nl = namelen + (name - oname);
+ struct sysctlnode nnode;
+
+ if (newp == NULL)
+ return EINVAL;
+ int error = sysctl_cvt_in(l, &v, newp, newlen, &nnode);
+ if (error)
+ return error;
- node = newp;
+ node = &nnode;
printf("namelen %d (", nl);
for (ni = 0; ni < nl - 1; ni++)
@@ -2147,7 +2154,7 @@ sysctl_createv(struct sysctllog **log, i
/*
* allow first caller to *set* a
* description actually to set it
- *
+ *
* discard const here so we can attach
* the description
*/
