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

In 'ipcperm()', only call 'suser()' if it is actually required.

Browse Source 
Previously, it was being called whether it was needed or not and the
ASU flag was being set (as a side affect of calling 'suser()') in
cases where superuser privileges were not actually needed.  This was
all pointed out to me by Bruce Evans.

Reviewed by:	bde
This commit is contained in:
Brian S. Dean 2000-03-13 23:00:08 +00:00
parent c9b2af93fa
commit 56fc73ff9b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/sysv_ipc.c
View File

@ -51,16 +51,11 @@ ipcperm(p, perm, mode)
int mode;
{
struct ucred *cred = p->p_ucred;
int error;
error = suser(p);
if (!error)
return (0);
/* Check for user match. */
if (cred->cr_uid != perm->cuid && cred->cr_uid != perm->uid) {
if (mode & IPC_M)
return (EPERM);
return (suser(p) == 0 ? 0 : EPERM);
/* Check for group match. */
mode >>= 3;
if (!groupmember(perm->gid, cred) &&
@ -71,7 +66,7 @@ ipcperm(p, perm, mode)
if (mode & IPC_M)
return (0);
return ((mode & perm->mode) == mode ? 0 : EACCES);
return ((mode & perm->mode) == mode || suser(p) == 0 ? 0 : EACCES);
}
#endif /* defined(SYSVSEM) || defined(SYSVSHM) || defined(SYSVMSG) */