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

set[ug]id(): call suser() only when neccesarry

Browse Source 
Submitted by: bde
This commit is contained in:
ache 1995-04-29 11:46:15 +00:00
parent 7c335c5e6e
commit e9b0cedd67
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/kern/kern_prot.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_prot.c 8.6 (Berkeley) 1/21/94
* $Id: kern_prot.c,v 1.9 1995/04/28 17:00:27 ache Exp $
* $Id: kern_prot.c,v 1.10 1995/04/28 18:17:29 ache Exp $
*/
/*
@ -261,24 +261,24 @@ setuid(p, uap, retval)
int error;
uid = uap->uid;
error = suser(pc->pc_ucred, &p->p_acflag);
if (uid != pc->p_ruid && uid != pc->p_svuid && error)
if (uid != pc->p_ruid && uid != pc->p_svuid &&
(error = suser(pc->pc_ucred, &p->p_acflag)))
return (error);
/*
* Everything's okay, do it.
* Transfer proc count to new user.
* Copy credentials so other references do not see our changes.
*/
if (!error && uid != pc->p_ruid) {
if (pc->pc_ucred->cr_uid == 0 && uid != pc->p_ruid) {
(void)chgproccnt(pc->p_ruid, -1);
(void)chgproccnt(uid, 1);
}
pc->pc_ucred = crcopy(pc->pc_ucred);
pc->pc_ucred->cr_uid = uid;
if (!error) {
if (pc->pc_ucred->cr_uid == 0) {
pc->p_ruid = uid;
pc->p_svuid = uid;
}
pc->pc_ucred->cr_uid = uid;
p->p_flag |= P_SUGID;
return (0);
}
@ -326,12 +326,12 @@ setgid(p, uap, retval)
int error;
gid = uap->gid;
error = suser(pc->pc_ucred, &p->p_acflag);
if (gid != pc->p_rgid && gid != pc->p_svgid && error)
if (gid != pc->p_rgid && gid != pc->p_svgid &&
(error = suser(pc->pc_ucred, &p->p_acflag)))
return (error);
pc->pc_ucred = crcopy(pc->pc_ucred);
pc->pc_ucred->cr_groups[0] = gid;
if (!error) {
if (pc->pc_ucred->cr_uid == 0) {
pc->p_rgid = gid;
pc->p_svgid = gid;
}