mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-27 11:20:58 +01:00
b1fc0ec1a7
real uid, saved uid, real gid, and saved gid to ucred, as well as the
pcred->pc_uidinfo, which was associated with the real uid, only rename
it to cr_ruidinfo so as not to conflict with cr_uidinfo, which
corresponds to the effective uid.
o Remove p_cred from struct proc; add p_ucred to struct proc, replacing
original macro that pointed.
p->p_ucred to p->p_cred->pc_ucred.
o Universally update code so that it makes use of ucred instead of pcred,
p->p_ucred instead of p->p_pcred, cr_ruidinfo instead of p_uidinfo,
cr_{r,sv}{u,g}id instead of p_*, etc.
o Remove pcred0 and its initialization from init_main.c; initialize
cr_ruidinfo there.
o Restruction many credential modification chunks to always crdup while
we figure out locking and optimizations; generally speaking, this
means moving to a structure like this:
newcred = crdup(oldcred);
...
p->p_ucred = newcred;
crfree(oldcred);
It's not race-free, but better than nothing. There are also races
in sys_process.c, all inter-process authorization, fork, exec, and
exit.
o Remove sigio->sio_ruid since sigio->sio_ucred now contains the ruid;
remove comments indicating that the old arrangement was a problem.
o Restructure exec1() a little to use newcred/oldcred arrangement, and
use improved uid management primitives.
o Clean up exit1() so as to do less work in credential cleanup due to
pcred removal.
o Clean up fork1() so as to do less work in credential cleanup and
allocation.
o Clean up ktrcanset() to take into account changes, and move to using
suser_xxx() instead of performing a direct uid==0 comparision.
o Improve commenting in various kern_prot.c credential modification
calls to better document current behavior. In a couple of places,
current behavior is a little questionable and we need to check
POSIX.1 to make sure it's "right". More commenting work still
remains to be done.
o Update credential management calls, such as crfree(), to take into
account new ruidinfo reference.
o Modify or add the following uid and gid helper routines:
change_euid()
change_egid()
change_ruid()
change_rgid()
change_svuid()
change_svgid()
In each case, the call now acts on a credential not a process, and as
such no longer requires more complicated process locking/etc. They
now assume the caller will do any necessary allocation of an
exclusive credential reference. Each is commented to document its
reference requirements.
o CANSIGIO() is simplified to require only credentials, not processes
and pcreds.
o Remove lots of (p_pcred==NULL) checks.
o Add an XXX to authorization code in nfs_lock.c, since it's
questionable, and needs to be considered carefully.
o Simplify posix4 authorization code to require only credentials, not
processes and pcreds. Note that this authorization, as well as
CANSIGIO(), needs to be updated to use the p_cansignal() and
p_cansched() centralized authorization routines, as they currently
do not take into account some desirable restrictions that are handled
by the centralized routines, as well as being inconsistent with other
similar authorization instances.
o Update libkvm to take these changes into account.
Obtained from: TrustedBSD Project
Reviewed by: green, bde, jhb, freebsd-arch, freebsd-audit
112 lines
3.3 KiB
C
112 lines
3.3 KiB
C
/*-
|
|
* Copyright (c) 1993 The Regents of the University of California.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
#include <sys/param.h>
|
|
#include <sys/systm.h>
|
|
#include <sys/lock.h>
|
|
#include <sys/mutex.h>
|
|
#include <sys/proc.h>
|
|
#include <sys/cons.h>
|
|
|
|
#include <ddb/ddb.h>
|
|
|
|
void
|
|
db_ps(dummy1, dummy2, dummy3, dummy4)
|
|
db_expr_t dummy1;
|
|
boolean_t dummy2;
|
|
db_expr_t dummy3;
|
|
char * dummy4;
|
|
{
|
|
int np;
|
|
int nl = 0;
|
|
volatile struct proc *p, *pp;
|
|
|
|
np = nprocs;
|
|
|
|
if (!LIST_EMPTY(&allproc))
|
|
p = LIST_FIRST(&allproc);
|
|
else
|
|
p = &proc0;
|
|
|
|
db_printf(" pid proc addr uid ppid pgrp flag stat wmesg wchan cmd\n");
|
|
while (--np >= 0) {
|
|
/*
|
|
* XXX just take 20 for now...
|
|
*/
|
|
if (nl++ == 20) {
|
|
int c;
|
|
|
|
db_printf("--More--");
|
|
c = cngetc();
|
|
db_printf("\r");
|
|
/*
|
|
* A whole screenfull or just one line?
|
|
*/
|
|
switch (c) {
|
|
case '\n': /* just one line */
|
|
nl = 20;
|
|
break;
|
|
case ' ':
|
|
nl = 0; /* another screenfull */
|
|
break;
|
|
default: /* exit */
|
|
db_printf("\n");
|
|
return;
|
|
}
|
|
}
|
|
if (p == NULL) {
|
|
printf("oops, ran out of processes early!\n");
|
|
break;
|
|
}
|
|
pp = p->p_pptr;
|
|
if (pp == NULL)
|
|
pp = p;
|
|
|
|
db_printf("%5d %8p %8p %4d %5d %5d %06x %d",
|
|
p->p_pid, (volatile void *)p, (void *)p->p_addr,
|
|
p->p_ucred ? p->p_ucred->cr_ruid : 0, pp->p_pid,
|
|
p->p_pgrp ? p->p_pgrp->pg_id : 0, p->p_flag, p->p_stat);
|
|
if (p->p_wchan) {
|
|
db_printf(" %6s %8p", p->p_wmesg, (void *)p->p_wchan);
|
|
} else {
|
|
db_printf(" ");
|
|
}
|
|
db_printf(" %s\n", p->p_comm ? p->p_comm : "");
|
|
|
|
p = LIST_NEXT(p, p_list);
|
|
if (p == NULL && np > 0)
|
|
p = LIST_FIRST(&zombproc);
|
|
}
|
|
}
|