From 56fc73ff9bfe1a2c7d4b632e2804b80c06d4dcf3 Mon Sep 17 00:00:00 2001 From: "Brian S. Dean" Date: Mon, 13 Mar 2000 23:00:08 +0000 Subject: [PATCH] In 'ipcperm()', only call 'suser()' if it is actually required. 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 --- sys/kern/sysv_ipc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index 581043c6d11..9bea4976a2a 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -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) */