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

o First step in cleaning up authorization code for the posix4

Browse Source 
implementation.  Move from direct uid 0 comparision to using suser_xxx()
  call with the same semantics.  Simplify CAN_AFFECT() macro as passed
  pcred was redundant.  The checks here still aren't "right", but they
  are probably "better".

Obtained from:	TrustedBSD Project
This commit is contained in:
Robert Watson 2001-05-06 16:15:42 +00:00
parent a2b5df0a56
commit 29b2efeb6b
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/p1003_1b.c
View File

@ -70,14 +70,14 @@ MALLOC_DEFINE(M_P31B, "p1003.1b", "Posix 1003.1B");
*
* Can process p, with pcred pc, do "write flavor" operations to process q?
*/
#define CAN_AFFECT(p, pc, q) \
((pc)->pc_ucred->cr_uid == 0 || \
(pc)->p_ruid == (q)->p_cred->p_ruid || \
(pc)->pc_ucred->cr_uid == (q)->p_cred->p_ruid || \
(pc)->p_ruid == (q)->p_ucred->cr_uid || \
(pc)->pc_ucred->cr_uid == (q)->p_ucred->cr_uid)
#define CAN_AFFECT(p, q) \
(!suser_xxx(NULL, p, PRISON_ROOT) || \
(p)->p_cred->pc_ruid == (q)->p_cred->p_ruid || \
(p)->p_ucred->cr_uid == (q)->p_cred->p_ruid || \
(p)->p_cred->pc_ruid == (q)->p_ucred->cr_uid || \
(p)->p_ucred->cr_uid == (q)->p_ucred->cr_uid)
#else
#define CAN_AFFECT(p, pc, q) ((pc)->pc_ucred->cr_uid == 0)
#define CAN_AFFECT(p, q) (!suser_xxx(NULL, p, PRISON_ROOT))
#endif
/*
@ -99,7 +99,7 @@ int p31b_proc(struct proc *p, pid_t pid, struct proc **pp)
{
/* Enforce permission policy.
*/
if (CAN_AFFECT(p, p->p_cred, other_proc))
if (CAN_AFFECT(p, other_proc))
*pp = other_proc;
else
ret = EPERM;

16
sys/posix4/p1003_1b.c
View File

@ -70,14 +70,14 @@ MALLOC_DEFINE(M_P31B, "p1003.1b", "Posix 1003.1B");
*
* Can process p, with pcred pc, do "write flavor" operations to process q?
*/
#define CAN_AFFECT(p, pc, q) \
((pc)->pc_ucred->cr_uid == 0 || \
(pc)->p_ruid == (q)->p_cred->p_ruid || \
(pc)->pc_ucred->cr_uid == (q)->p_cred->p_ruid || \
(pc)->p_ruid == (q)->p_ucred->cr_uid || \
(pc)->pc_ucred->cr_uid == (q)->p_ucred->cr_uid)
#define CAN_AFFECT(p, q) \
(!suser_xxx(NULL, p, PRISON_ROOT) || \
(p)->p_cred->pc_ruid == (q)->p_cred->p_ruid || \
(p)->p_ucred->cr_uid == (q)->p_cred->p_ruid || \
(p)->p_cred->pc_ruid == (q)->p_ucred->cr_uid || \
(p)->p_ucred->cr_uid == (q)->p_ucred->cr_uid)
#else
#define CAN_AFFECT(p, pc, q) ((pc)->pc_ucred->cr_uid == 0)
#define CAN_AFFECT(p, q) (!suser_xxx(NULL, p, PRISON_ROOT))
#endif
/*
@ -99,7 +99,7 @@ int p31b_proc(struct proc *p, pid_t pid, struct proc **pp)
{
/* Enforce permission policy.
*/
if (CAN_AFFECT(p, p->p_cred, other_proc))
if (CAN_AFFECT(p, other_proc))
*pp = other_proc;
else
ret = EPERM;