xnu-1504.9.17.tar.gz

[apple/xnu.git] / bsd / kern / sysv_ipc.c

diff --git a/bsd/kern/sysv_ipc.c b/bsd/kern/sysv_ipc.c
index 9b63e4fa1a63fc873391fd61fb6b1c3baad118a5..95c23d418efb580d09459b9b0e3d319b5e31eac3 100644 (file)
--- a/bsd/kern/sysv_ipc.c
+++ b/bsd/kern/sysv_ipc.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*     $NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $ */
 
  */
 /*     $NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $ */
 


@@ -58,6 +61,7 @@
 #include <sys/param.h>
 #include <sys/ipc.h>
 #include <sys/ucred.h>
 #include <sys/param.h>
 #include <sys/ipc.h>
 #include <sys/ucred.h>

+#include <sys/kauth.h>

 
 
 /*
 
 
 /*


@@ -67,96 +71,35 @@
  * XXX: proc->p_acflag to suser()
  */
 
  * XXX: proc->p_acflag to suser()
  */
 

+/*
+ * Returns:    0                       Success
+ *             EPERM
+ *             EACCES
+ */

 int
 int

-ipcperm(cred, perm, mode)
-       struct ucred *cred;
-       struct ipc_perm *perm;
-       int mode;
+ipcperm(kauth_cred_t cred, struct ipc_perm *perm, int mode)

 {
 
        if (!suser(cred, (u_short *)NULL))
                return (0);
 
        /* Check for user match. */
 {
 
        if (!suser(cred, (u_short *)NULL))
                return (0);
 
        /* Check for user match. */

-       if (cred->cr_uid != perm->cuid && cred->cr_uid != perm->uid) {
+       if (kauth_cred_getuid(cred) != perm->cuid && kauth_cred_getuid(cred) != perm->uid) {
+               int is_member;
+

                if (mode & IPC_M)
                        return (EPERM);
                /* Check for group match. */
                mode >>= 3;
                if (mode & IPC_M)
                        return (EPERM);
                /* Check for group match. */
                mode >>= 3;

-               if (!groupmember(perm->gid, cred) &&
-                   !groupmember(perm->cgid, cred))
+               if ((kauth_cred_ismember_gid(cred, perm->gid, &is_member) || !is_member) &&
+                   (kauth_cred_ismember_gid(cred, perm->cgid, &is_member) || !is_member)) {

                        /* Check for `other' match. */
                        mode >>= 3;
        }
                        /* Check for `other' match. */
                        mode >>= 3;
        }

+       }

 
        if (mode & IPC_M)
                return (0);
 
        if (mode & IPC_M)
                return (0);

+

        return ((mode & perm->mode) == mode ? 0 : EACCES);
 }
        return ((mode & perm->mode) == mode ? 0 : EACCES);
 }

-
-
-
-/*
- * SYSVMSG stubs
- */
-
-int
-msgsys(p, uap)
-       struct proc *p;
-       /* XXX actually varargs. */
-#if 0
-       struct msgsys_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};
-
-int
-msgctl(p, uap)
-       struct proc *p;
-#if 0
-       register struct msgctl_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};
-
-int
-msgget(p, uap)
-       struct proc *p;
-#if 0
-       register struct msgget_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};
-
-int
-msgsnd(p, uap)
-       struct proc *p;
-#if 0
-       register struct msgsnd_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};
-
-int
-msgrcv(p, uap)
-       struct proc *p;
-#if 0
-       register struct msgrcv_args *uap;
-#else
-       void *uap;
-#endif
-{
-       return(EOPNOTSUPP);
-};