d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an obscure feature, needed for debugging.

Browse Source
This commit is contained in:
phk 1995-12-17 21:11:22 +00:00
parent 3fb9f35b87
commit ff950705d4
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/kern_sysctl.c
View File

@ -37,7 +37,7 @@
* SUCH DAMAGE.
*
* @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94
* $Id: kern_sysctl.c,v 1.56 1995/12/07 12:46:52 davidg Exp $
* $Id: kern_sysctl.c,v 1.57 1995/12/14 08:31:36 phk Exp $
*/
#include <sys/param.h>
@ -563,7 +563,7 @@ sysctl_sysctl_name2oid SYSCTL_HANDLER_ARGS
return (error);
}
SYSCTL_PROC(_sysctl, 3, name2oid, CTLFLAG_RW, 0, 0,
SYSCTL_PROC(_sysctl, 3, name2oid, CTLFLAG_RW|CTLFLAG_ANYBODY, 0, 0,
sysctl_sysctl_name2oid, "I", "");
static int
@ -698,7 +698,7 @@ sysctl_handle_opaque SYSCTL_HANDLER_ARGS
* XXX: rather untested at this point
*/
static int
sysctl_old_kernel(struct sysctl_req *req, void *p, int l)
sysctl_old_kernel(struct sysctl_req *req, const void *p, int l)
{
int i = 0;
@ -715,7 +715,7 @@ sysctl_old_kernel(struct sysctl_req *req, void *p, int l)
}
static int
sysctl_new_kernel(struct sysctl_req *req, void *p, int l)
sysctl_new_kernel(struct sysctl_req *req, const void *p, int l)
{
if (!req->newptr)
return 0;
@ -730,7 +730,7 @@ sysctl_new_kernel(struct sysctl_req *req, void *p, int l)
* Transfer function to/from user space.
*/
static int
sysctl_old_user(struct sysctl_req *req, void *p, int l)
sysctl_old_user(struct sysctl_req *req, const void *p, int l)
{
int error = 0, i = 0;
@ -807,11 +807,16 @@ sysctl_root SYSCTL_HANDLER_ARGS
}
return ENOENT;
found:
/* If writing isn't allowed */
if (req->newptr && !((*oidpp)->oid_kind & CTLFLAG_WR))
return (EPERM);
/* Most likely only root can write */
if (!((*oidpp)->oid_kind & CTLFLAG_ANYBODY) &&
req->newptr && req->p &&
(i = suser(req->p->p_ucred, &req->p->p_acflag)))
return (i);
if (!(*oidpp)->oid_handler)
return EINVAL;
@ -877,9 +882,6 @@ userland_sysctl(struct proc *p, int *name, u_int namelen, void *old, size_t *old
req.p = p;
if (new != NULL && (error = suser(p->p_ucred, &p->p_acflag)))
return (error);
if (oldlenp) {
if (inkernel) {
req.oldlen = *oldlenp;

5
sys/sys/sysctl.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)sysctl.h 8.1 (Berkeley) 6/2/93
* $Id: sysctl.h,v 1.37 1995/12/04 16:48:52 phk Exp $
* $Id: sysctl.h,v 1.38 1995/12/09 20:46:06 phk Exp $
*/
#ifndef _SYS_SYSCTL_H_
@ -75,6 +75,7 @@ struct ctlname {
#define CTLFLAG_WR 0x40000000 /* Allow writes to the variable */
#define CTLFLAG_RW (CTLFLAG_RD|CTLFLAG_WR)
#define CTLFLAG_NOLOCK 0x20000000 /* XXX Don't Lock */
#define CTLFLAG_ANYBODY 0x10000000 /* All users can set this var */
#define OID_AUTO (-1)
@ -92,7 +93,7 @@ struct sysctl_req {
void *oldptr;
int oldlen;
int oldidx;
int (*oldfunc)(struct sysctl_req *, void *, int);
int (*oldfunc)(struct sysctl_req *, const void *, int);
void *newptr;
int newlen;
int newidx;