X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5c9f46613a83ebfc29a5b1f099448259e96a98f0..f427ee49d309d8fc33ebf3042c3a775f2f530ded:/bsd/kern/kern_xxx.c

diff --git a/bsd/kern/kern_xxx.c b/bsd/kern/kern_xxx.c
index c922c1641..2e111de75 100644
--- 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@
- * 
+ *
  * 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.
- * 
+ *
  * 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,
@@ -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.
- * 
+ *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
@@ -84,16 +84,21 @@
 #if CONFIG_MACF
 #include <security/mac_framework.h>
 #endif
+#if CONFIG_ATM
+#include <atm/atm_internal.h>
+#endif
 
-int pshm_cache_purge_all(proc_t p);
-int psem_cache_purge_all(proc_t p);
+extern int psem_cache_purge_all(proc_t p);
+extern int pshm_cache_purge_all(proc_t p);
+extern void reset_osvariant_status(void);
+extern void reset_osreleasetype(void);
 
 int
 reboot(struct proc *p, struct reboot_args *uap, __unused int32_t *retval)
 {
 	char message[256];
-	int error=0;
-	size_t dummy=0;
+	int error = 0;
+	size_t dummy = 0;
 #if CONFIG_MACF
 	kauth_cred_t my_cred;
 #endif
@@ -104,30 +109,36 @@ reboot(struct proc *p, struct reboot_args *uap, __unused int32_t *retval)
 
 	if ((error = suser(kauth_cred_get(), &p->p_acflag))) {
 #if (DEVELOPMENT || DEBUG)
-		/* allow non-root user to call panic on dev/debug kernels */
-		if (!(uap->opt & RB_PANIC))
+		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_COMMAND)
-                return ENOSYS;
-
-        if (uap->opt & RB_PANIC) {
-		error = copyinstr(uap->command, (void *)message, sizeof(message), (size_t *)&dummy);
-        }
+	if (uap->opt & RB_PANIC && uap->msg != USER_ADDR_NULL) {
+		int copy_error = copyinstr(uap->msg, (void *)message, sizeof(message), (size_t *)&dummy);
+		if (copy_error != 0 && copy_error != ENAMETOOLONG) {
+			strncpy(message, "user space RB_PANIC message copyin failed", sizeof(message) - 1);
+		} else {
+			message[sizeof(message) - 1] = '\0';
+		}
+	}
 
 #if CONFIG_MACF
 #if (DEVELOPMENT || DEBUG)
-        if (uap->opt & RB_PANIC) {
+	if (uap->opt & RB_PANIC) {
 		/* on dev/debug kernels: allow anyone to call panic */
 		goto skip_cred_check;
 	}
 #endif
-	if (error)
-		return (error);
+	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);
@@ -139,9 +150,12 @@ skip_cred_check:
 		OSBitOrAtomic(P_REBOOT, &p->p_flag);  /* No more signals for this proc */
 		error = reboot_kernel(uap->opt, message);
 	}
-	return(error);
+	return error;
 }
 
+extern void OSKextResetAfterUserspaceReboot(void);
+extern void zone_gc(boolean_t);
+
 int
 usrctl(struct proc *p, __unused struct usrctl_args *uap, __unused int32_t *retval)
 {
@@ -149,11 +163,28 @@ usrctl(struct proc *p, __unused struct usrctl_args *uap, __unused int32_t *retva
 		return EPERM;
 	}
 
-	int error = 0;
-	error = pshm_cache_purge_all(p);
-	if (error)
-		return error;
+	reset_osvariant_status();
+	reset_osreleasetype();
 
-	error = psem_cache_purge_all(p);
-	return error;
+#if CONFIG_ATM
+	atm_reset();
+#endif
+
+#if CONFIG_EXT_RESOLVER
+	/*
+	 * We're doing a user space reboot.  We are guaranteed that the
+	 * external identity resolver is gone, so ensure that everything
+	 * comes back up as with fresh-boot just in case it didn't go
+	 * down cleanly.
+	 */
+	kauth_resolver_identity_reset();
+#endif /* CONFIG_EXT_RESOLVER */
+
+	OSKextResetAfterUserspaceReboot();
+	int shm_error = pshm_cache_purge_all(p);
+	int sem_error = psem_cache_purge_all(p);
+
+	zone_gc(FALSE);
+
+	return shm_error != 0 ? shm_error : sem_error;
 }