xnu-6153.61.1.tar.gz

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

diff --git a/bsd/kern/kern_xxx.c b/bsd/kern/kern_xxx.c
index fc94a14e09f171f30e9eb5ffcdf62e3a2493dda6..ee65deb6c97bf6f7ce27dc6439afb261cb940023 100644 (file)
--- a/bsd/kern/kern_xxx.c
+++ b/bsd/kern/kern_xxx.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2000-2009 Apple 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */


@@ -85,36 +85,79 @@
 #include <security/mac_framework.h>
 #endif
 
 #include <security/mac_framework.h>
 #endif
 

+int pshm_cache_purge_all(proc_t p);
+int psem_cache_purge_all(proc_t p);
+

 int
 int

-reboot(struct proc *p, register struct reboot_args *uap, __unused int32_t *retval)
+reboot(struct proc *p, struct reboot_args *uap, __unused int32_t *retval)

 {
 {

-       char command[64];
-       int error=0;
-       size_t dummy=0;
+       char message[256];
+       int error = 0;
+       size_t dummy = 0;

 #if CONFIG_MACF
        kauth_cred_t my_cred;
 #endif
 
        AUDIT_ARG(cmd, uap->opt);
 
 #if CONFIG_MACF
        kauth_cred_t my_cred;
 #endif
 
        AUDIT_ARG(cmd, uap->opt);
 

-       command[0] = '\0';
+       message[0] = '\0';
+
+       if ((error = suser(kauth_cred_get(), &p->p_acflag))) {
+#if (DEVELOPMENT || DEBUG)
+               if (uap->opt & RB_PANIC) {
+                       /* clear 'error' to allow non-root users to call panic on dev/debug kernels */
+                       error = 0;
+               } else {
+                       return error;
+               }
+#else
+               return error;
+#endif
+       }
+
+       if (uap->opt & RB_PANIC && uap->msg != USER_ADDR_NULL) {
+               if (copyinstr(uap->msg, (void *)message, sizeof(message), (size_t *)&dummy)) {
+                       strncpy(message, "user space RB_PANIC message copyin failed", sizeof(message) - 1);
+               }
+       }

 
 

-       if ((error = suser(kauth_cred_get(), &p->p_acflag)))
-               return(error);  
-       
-       if (uap->opt & RB_COMMAND)
-               error = copyinstr(uap->command,
-                                       (void *)command, sizeof(command), (size_t *)&dummy);

 #if CONFIG_MACF
 #if CONFIG_MACF

-       if (error)
-               return (error);
+#if (DEVELOPMENT || DEBUG)
+       if (uap->opt & RB_PANIC) {
+               /* on dev/debug kernels: allow anyone to call panic */
+               goto skip_cred_check;
+       }
+#endif
+       if (error) {
+               return error;
+       }

        my_cred = kauth_cred_proc_ref(p);
        error = mac_system_check_reboot(my_cred, uap->opt);
        kauth_cred_unref(&my_cred);
        my_cred = kauth_cred_proc_ref(p);
        error = mac_system_check_reboot(my_cred, uap->opt);
        kauth_cred_unref(&my_cred);

+#if (DEVELOPMENT || DEBUG)
+skip_cred_check:
+#endif

 #endif
        if (!error) {
                OSBitOrAtomic(P_REBOOT, &p->p_flag);  /* No more signals for this proc */
 #endif
        if (!error) {
                OSBitOrAtomic(P_REBOOT, &p->p_flag);  /* No more signals for this proc */

-               error = boot(RB_BOOT, uap->opt, command);
+               error = reboot_kernel(uap->opt, message);

        }
        }

-       return(error);
+       return error;
+}
+
+int
+usrctl(struct proc *p, __unused struct usrctl_args *uap, __unused int32_t *retval)
+{
+       if (p != initproc) {
+               return EPERM;
+       }
+
+       int error = 0;
+       error = pshm_cache_purge_all(p);
+       if (error) {
+               return error;
+       }
+
+       error = psem_cache_purge_all(p);
+       return error;

 }
 }