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

o Cache req->td->td_proc->p_ucred->cr_prison in pr to improve

Browse Source 
readability.
o Conditionalize only the SYSCTL definitions for the regression
  tree, not the variables itself, decreasing the number of #ifdef
  REGRESSIONs scattered in kern_mib.c, and making the code more
  readable.

Sponsored by:	DARPA, NAI Labs
This commit is contained in:
Robert Watson 2001-11-28 21:22:05 +00:00
parent 614b366763
commit 1e4b531bb6
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/kern/kern_mib.c
View File

@ -154,14 +154,15 @@ char hostname[MAXHOSTNAMELEN];
static int static int
sysctl_hostname(SYSCTL_HANDLER_ARGS) sysctl_hostname(SYSCTL_HANDLER_ARGS)
{ {
struct prison *pr;
int error; int error;
if (jailed(req->td->td_proc->p_ucred)) { pr = req->td->td_proc->p_ucred->cr_prison;
if (pr != NULL) {
if (!jail_set_hostname_allowed && req->newptr) if (!jail_set_hostname_allowed && req->newptr)
return (EPERM); return (EPERM);
error = sysctl_handle_string(oidp, error = sysctl_handle_string(oidp, pr->pr_host,
req->td->td_proc->p_ucred->cr_prison->pr_host, sizeof pr->pr_host, req);
sizeof req->td->td_proc->p_ucred->cr_prison->pr_host, req);
} else } else
error = sysctl_handle_string(oidp, error = sysctl_handle_string(oidp,
hostname, sizeof hostname, req); hostname, sizeof hostname, req);
@ -172,9 +173,9 @@ SYSCTL_PROC(_kern, KERN_HOSTNAME, hostname,
CTLTYPE_STRING|CTLFLAG_RW|CTLFLAG_PRISON, CTLTYPE_STRING|CTLFLAG_RW|CTLFLAG_PRISON,
0, 0, sysctl_hostname, "A", "Hostname"); 0, 0, sysctl_hostname, "A", "Hostname");
#ifdef REGRESSION
static int regression_securelevel_nonmonotonic = 0; static int regression_securelevel_nonmonotonic = 0;
#ifdef REGRESSION
SYSCTL_INT(_regression, OID_AUTO, securelevel_nonmonotonic, CTLFLAG_RW, SYSCTL_INT(_regression, OID_AUTO, securelevel_nonmonotonic, CTLFLAG_RW,
&regression_securelevel_nonmonotonic, 0, "securelevel may be lowered"); &regression_securelevel_nonmonotonic, 0, "securelevel may be lowered");
#endif #endif
@ -205,17 +206,13 @@ sysctl_kern_securelvl(SYSCTL_HANDLER_ARGS)
* global level, and local level if any. * global level, and local level if any.
*/ */
if (pr != NULL) { if (pr != NULL) {
#ifdef REGRESSION if (!regression_securelevel_nonmonotonic &&
if (!regression_securelevel_nonmonotonic) (level < imax(securelevel, pr->pr_securelevel)))
#endif
if (level < imax(securelevel, pr->pr_securelevel))
return (EPERM); return (EPERM);
pr->pr_securelevel = level; pr->pr_securelevel = level;
} else { } else {
#ifdef REGRESSION if (!regression_securelevel_nonmonotonic &&
if (!regression_securelevel_nonmonotonic) (level < securelevel))
#endif
if (level < securelevel)
return (EPERM); return (EPERM);
securelevel = level; securelevel = level;
} }