Use explicit Giant locks and unlocks for rather than instrumented ones for

code that is still not safe.  suser() reads p_ucred so it still needs
Giant for the time being.  This should allow kern.giant.proc to be set
to 0 for the time being.
This commit is contained in:
jhb 2002-03-22 21:02:02 +00:00
parent 1a59c73a2c
commit 1fdacc17a9

View File

@ -165,9 +165,9 @@ getpgid(td, uap)
{
struct proc *p = td->td_proc;
struct proc *pt;
int error, s;
int error;
s = mtx_lock_giant(kern_giant_proc);
mtx_lock(&Giant);
error = 0;
if (uap->pid == 0) {
PROC_LOCK(p);
@ -181,7 +181,7 @@ getpgid(td, uap)
td->td_retval[0] = pt->p_pgrp->pg_id;
PROC_UNLOCK(pt);
}
mtx_unlock_giant(s);
mtx_unlock(&Giant);
return (error);
}
@ -204,9 +204,8 @@ getsid(td, uap)
struct proc *p = td->td_proc;
struct proc *pt;
int error;
int s;
s = mtx_lock_giant(kern_giant_proc);
mtx_lock(&Giant);
error = 0;
if (uap->pid == 0) {
PROC_LOCK(p);
@ -220,7 +219,7 @@ getsid(td, uap)
td->td_retval[0] = pt->p_session->s_sid;
PROC_UNLOCK(pt);
}
mtx_unlock_giant(s);
mtx_unlock(&Giant);
return (error);
}