Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*Don't* call sys___sysctl() from within the kernel. Use old_sysctl()

Browse Source 
instead.
This commit is contained in:
atatat 2004-03-09 03:18:03 +00:00
parent f0e2808b8b
commit c2309bcca6
2 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/compat/ibcs2/ibcs2_misc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ibcs2_misc.c,v 1.68 2003/11/19 15:46:16 christos Exp $ */
/* $NetBSD: ibcs2_misc.c,v 1.69 2004/03/09 03:18:03 atatat Exp $ */
/*
* Copyright (c) 1992, 1993
@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.68 2003/11/19 15:46:16 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.69 2004/03/09 03:18:03 atatat Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -876,7 +876,6 @@ ibcs2_sys_sysconf(l, v, retval)
struct proc *p = l->l_proc;
int mib[2], value, error;
size_t len;
struct sys___sysctl_args sa;
struct sys_getrlimit_args ga;
switch(SCARG(uap, name)) {
@ -942,14 +941,13 @@ ibcs2_sys_sysconf(l, v, retval)
mib[0] = CTL_KERN;
len = sizeof(value);
SCARG(&sa, name) = mib;
SCARG(&sa, namelen) = 2;
SCARG(&sa, old) = &value;
SCARG(&sa, oldlenp) = &len;
SCARG(&sa, new) = NULL;
SCARG(&sa, newlen) = 0;
if ((error = sys___sysctl(l, &sa, retval)) != 0)
return error;
/*
* calling into sysctl with superuser privs, but we don't mind,
* 'cause we're only querying a value.
*/
error = old_sysctl(&mib[0], 2, &value, &len, NULL, 0, NULL);
if (error)
return (error);
*retval = value;
return 0;
}

29
sys/compat/irix/irix_syssgi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: irix_syssgi.c,v 1.38 2003/11/13 03:09:29 chs Exp $ */
/* $NetBSD: irix_syssgi.c,v 1.39 2004/03/09 03:18:03 atatat Exp $ */
/*-
* Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: irix_syssgi.c,v 1.38 2003/11/13 03:09:29 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: irix_syssgi.c,v 1.39 2004/03/09 03:18:03 atatat Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@ -461,8 +461,7 @@ irix_syssgi_sysconf(name, l, retval)
struct proc *p = l->l_proc;
int error = 0;
int mib[2], value;
int len = sizeof(value);
struct sys___sysctl_args cup;
size_t len = sizeof(value);
caddr_t sg = stackgap_init(p, 0);
switch (name) {
@ -518,20 +517,14 @@ irix_syssgi_sysconf(name, l, retval)
break;
}
SCARG(&cup, name) = stackgap_alloc(p, &sg, sizeof(mib));
if ((error = copyout(&mib, SCARG(&cup, name), sizeof(mib))) != 0)
return error;
SCARG(&cup, namelen) = sizeof(mib);
SCARG(&cup, old) = stackgap_alloc(p, &sg, sizeof(value));
if ((copyout(&value, SCARG(&cup, old), sizeof(value))) != 0)
return error;
SCARG(&cup, oldlenp) = stackgap_alloc(p, &sg, sizeof(len));
if ((copyout(&len, SCARG(&cup, oldlenp), sizeof(len))) != 0)
return error;
SCARG(&cup, new) = NULL;
SCARG(&cup, newlen) = 0;
return sys___sysctl(l, &cup, retval);
/*
* calling into sysctl with superuser privs, but we don't mind
* 'cause we're only querying a value.
*/
error = old_sysctl(&mib[0], 2, &value, &len, NULL, 0, NULL);
if (error == 0)
*retval = value;
return (error);
}
static int