summaryrefslogtreecommitdiffstats
path: root/sys/kern/sysv_msg.c
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2007-06-12 00:12:01 +0000
committerrwatson <rwatson@FreeBSD.org>2007-06-12 00:12:01 +0000
commit00b02345d424dac8a490ff28ff75fd9386196583 (patch)
treec439df85bebf079d07319c231d64ac481577b036 /sys/kern/sysv_msg.c
parente93b04c2868ee901613297bfbd90ff9990d8300e (diff)
downloadFreeBSD-src-00b02345d424dac8a490ff28ff75fd9386196583.zip
FreeBSD-src-00b02345d424dac8a490ff28ff75fd9386196583.tar.gz
Eliminate now-unused SUSER_ALLOWJAIL arguments to priv_check_cred(); in
some cases, move to priv_check() if it was an operation on a thread and no other flags were present. Eliminate caller-side jail exception checking (also now-unused); jail privilege exception code now goes solely in kern_jail.c. We can't yet eliminate suser() due to some cases in the KAME code where a privilege check is performed and then used in many different deferred paths. Do, however, move those prototypes to priv.h. Reviewed by: csjp Obtained from: TrustedBSD Project
Diffstat (limited to 'sys/kern/sysv_msg.c')
-rw-r--r--sys/kern/sysv_msg.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index d9f3207..bd5ca90 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -502,8 +502,7 @@ kern_msgctl(td, msqid, cmd, msqbuf)
if ((error = ipcperm(td, &msqkptr->u.msg_perm, IPC_M)))
goto done2;
if (msqbuf->msg_qbytes > msqkptr->u.msg_qbytes) {
- error = priv_check_cred(td->td_ucred,
- PRIV_IPC_MSGSIZE, SUSER_ALLOWJAIL);
+ error = priv_check(td, PRIV_IPC_MSGSIZE);
if (error)
goto done2;
}
OpenPOWER on IntegriCloud