/*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * 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.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * 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 OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
* @APPLE_LICENSE_HEADER_END@
*/
#include <sys/ptrace.h>
#include <sys/user.h>
#include <sys/aio_kern.h>
-#include <sys/kern_audit.h>
+
+#include <bsm/audit_kernel.h>
+#include <bsm/audit_kevents.h>
#include <mach/mach_types.h>
#include <kern/thread.h>
#include <kern/assert.h>
#if KTRACE
#include <sys/ktrace.h>
+#include <sys/ubc.h>
#endif
extern char init_task_failure_data[];
int exit1 __P((struct proc *, int, int *));
void proc_prepareexit(struct proc *p);
-void vfork_exit(struct proc *p, int rv);
+int vfork_exit(struct proc *p, int rv);
void vproc_exit(struct proc *p);
/*
ut = get_bsdthread_info(self);
if (ut->uu_flag & P_VFORK) {
- vfork_exit(p, rv);
+ if (!vfork_exit(p, rv)) {
vfork_return(self, p->p_pptr, p , retval);
unix_syscall_return(0);
/* NOT REACHED */
+ }
+ return(EINVAL);
}
- audit_syscall_exit(0, p, ut); /* Exit is always successfull */
+ AUDIT_SYSCALL_EXIT(0, p, ut); /* Exit is always successfull */
signal_lock(p);
while (p->exit_thread != self) {
if (sig_try_locked(p) <= 0) {
if (p->p_tracep) {
struct vnode *tvp = p->p_tracep;
p->p_tracep = NULL;
+
+ if (UBCINFOEXISTS(tvp))
+ ubc_rele(tvp);
vrele(tvp);
}
#endif
{
struct wait4_args *a;
- a = (struct wait4_args *)get_bsduthreadarg(current_act);
+ a = (struct wait4_args *)get_bsduthreadarg(current_act());
a->rusage = uap->rusage;
a->options = uap->options;
{
register struct proc *p = current_proc();
- if (suser(p->p_ucred, &p->p_acflag))
+ AUDIT_MACH_SYSCALL_ENTER(AUE_INITPROCESS);
+ if (suser(p->p_ucred, &p->p_acflag)) {
+ AUDIT_MACH_SYSCALL_EXIT(KERN_NO_ACCESS);
return(KERN_NO_ACCESS);
+ }
if (p->p_pid != 1 && p->p_pgid != p->p_pid)
enterpgrp(p, p->p_pid, 0);
p->p_sibling.le_next = NULL;
p->p_pptr = kernproc;
+ AUDIT_MACH_SYSCALL_EXIT(KERN_SUCCESS);
return(KERN_SUCCESS);
}
* status and rusage for wait(). Check for child processes and orphan them.
*/
-void
+int
vfork_exit(p, rv)
struct proc *p;
int rv;
struct uthread *ut;
exception_data_t code[EXCEPTION_CODE_MAX];
- /*
- * If a thread in this task has already
- * called exit(), then halt any others
- * right here.
- */
-
- ut = get_bsdthread_info(self);
-#ifdef FIXME
- signal_lock(p);
- while (p->exit_thread != self) {
- if (sig_try_locked(p) <= 0) {
- if (get_threadtask(self) != task) {
- signal_unlock(p);
- return;
- }
- signal_unlock(p);
- thread_terminate(self);
- thread_funnel_set(kernel_flock, FALSE);
- thread_exception_return();
- /* NOTREACHED */
- }
- sig_lock_to_exit(p);
- }
- signal_unlock(p);
- if (p->p_pid == 1) {
- printf("pid 1 exited (signal %d, exit %d)",
- WTERMSIG(rv), WEXITSTATUS(rv));
-panic("init died\nState at Last Exception:\n\n%s", init_task_failure_data);
- }
-#endif /* FIXME */
-
+ ut = get_bsdthread_info(self);
+ if (p->exit_thread) {
+ return(1);
+ }
+ p->exit_thread = self;
+
s = splsched();
p->p_flag |= P_WEXIT;
splx(s);
p->p_xstat = rv;
vproc_exit(p);
+ return(0);
}
void
if (p->p_tracep) {
struct vnode *tvp = p->p_tracep;
p->p_tracep = NULL;
+
+ if (UBCINFOEXISTS(tvp))
+ ubc_rele(tvp);
vrele(tvp);
}
#endif
projects / apple / xnu.git / blobdiff