summaryrefslogtreecommitdiffstats
path: root/sys/kern/sysv_msg.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-04-27 12:21:16 +0000
committerphk <phk@FreeBSD.org>1999-04-27 12:21:16 +0000
commitc85ea5017c00c71172e6cfb5bd1cd171837b5812 (patch)
treeaca6b1fc91e0bab42a5779a3281ed2200865e0ec /sys/kern/sysv_msg.c
parenta6d35492b341c0b95e74bb23a0f1d29bdf6b9fa5 (diff)
downloadFreeBSD-src-c85ea5017c00c71172e6cfb5bd1cd171837b5812.zip
FreeBSD-src-c85ea5017c00c71172e6cfb5bd1cd171837b5812.tar.gz
Change suser_xxx() to suser() where it applies.
Diffstat (limited to 'sys/kern/sysv_msg.c')
-rw-r--r--sys/kern/sysv_msg.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 151a843..4d0e3e7 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/* $Id: sysv_msg.c,v 1.20 1999/04/21 13:30:01 sada Exp $ */
+/* $Id: sysv_msg.c,v 1.21 1999/04/27 11:16:16 phk Exp $ */
/*
* Implementation of SVID messages
@@ -178,7 +178,6 @@ msgctl(p, uap)
int msqid = uap->msqid;
int cmd = uap->cmd;
struct msqid_ds *user_msqptr = uap->buf;
- struct ucred *cred = p->p_ucred;
int rval, eval;
struct msqid_ds msqbuf;
register struct msqid_ds *msqptr;
@@ -220,7 +219,7 @@ msgctl(p, uap)
case IPC_RMID:
{
struct msg *msghdr;
- if ((eval = ipcperm(cred, &msqptr->msg_perm, IPC_M)))
+ if ((eval = ipcperm(p, &msqptr->msg_perm, IPC_M)))
return(eval);
/* Free the message headers */
msghdr = msqptr->msg_first;
@@ -248,12 +247,12 @@ msgctl(p, uap)
break;
case IPC_SET:
- if ((eval = ipcperm(cred, &msqptr->msg_perm, IPC_M)))
+ if ((eval = ipcperm(p, &msqptr->msg_perm, IPC_M)))
return(eval);
if ((eval = copyin(user_msqptr, &msqbuf, sizeof(msqbuf))) != 0)
return(eval);
if (msqbuf.msg_qbytes > msqptr->msg_qbytes) {
- eval = suser_xxx(cred, &p->p_acflag);
+ eval = suser(p);
if (eval)
return(eval);
}
@@ -279,7 +278,7 @@ msgctl(p, uap)
break;
case IPC_STAT:
- if ((eval = ipcperm(cred, &msqptr->msg_perm, IPC_R))) {
+ if ((eval = ipcperm(p, &msqptr->msg_perm, IPC_R))) {
#ifdef MSG_DEBUG_OK
printf("requester doesn't have read access\n");
#endif
@@ -340,7 +339,7 @@ msgget(p, uap)
#endif
return(EEXIST);
}
- if ((eval = ipcperm(cred, &msqptr->msg_perm, msgflg & 0700 ))) {
+ if ((eval = ipcperm(p, &msqptr->msg_perm, msgflg & 0700 ))) {
#ifdef MSG_DEBUG_OK
printf("requester doesn't have 0%o access\n",
msgflg & 0700);
@@ -426,7 +425,6 @@ msgsnd(p, uap)
size_t msgsz = uap->msgsz;
int msgflg = uap->msgflg;
int segs_needed, eval;
- struct ucred *cred = p->p_ucred;
register struct msqid_ds *msqptr;
register struct msg *msghdr;
short next;
@@ -460,7 +458,7 @@ msgsnd(p, uap)
return(EINVAL);
}
- if ((eval = ipcperm(cred, &msqptr->msg_perm, IPC_W))) {
+ if ((eval = ipcperm(p, &msqptr->msg_perm, IPC_W))) {
#ifdef MSG_DEBUG_OK
printf("requester doesn't have write access\n");
#endif
@@ -763,7 +761,6 @@ msgrcv(p, uap)
long msgtyp = uap->msgtyp;
int msgflg = uap->msgflg;
size_t len;
- struct ucred *cred = p->p_ucred;
register struct msqid_ds *msqptr;
register struct msg *msghdr;
int eval;
@@ -798,7 +795,7 @@ msgrcv(p, uap)
return(EINVAL);
}
- if ((eval = ipcperm(cred, &msqptr->msg_perm, IPC_R))) {
+ if ((eval = ipcperm(p, &msqptr->msg_perm, IPC_R))) {
#ifdef MSG_DEBUG_OK
printf("requester doesn't have read access\n");
#endif
OpenPOWER on IntegriCloud