/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
- * 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. 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.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE 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_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
#include <sys/time.h>
#include <kern/task.h>
#include <vm/vm_map.h>
#include <sys/systm.h>
#include <sys/conf.h>
+#include <sys/proc_internal.h>
#include <sys/buf.h> /* for SET */
#include <sys/user.h>
+#include <sys/sysent.h>
+#include <sys/sysproto.h>
/* Just to satisfy pstat command */
int dmmin, dmmax, dmtext;
+vm_offset_t
kmem_mb_alloc(vm_map_t mbmap, int size)
{
vm_offset_t addr;
if (kernel_memory_allocate(mbmap, &addr, size,
0,
- KMA_NOPAGEWAIT|KMA_KOBJECT) == KERN_SUCCESS)
- return((void *)addr);
+ KMA_NOPAGEWAIT|KMA_KOBJECT|KMA_LOMEM) == KERN_SUCCESS)
+ return(addr);
else
return(0);
}
-pcb_synch() {}
+/*
+ * XXX this function only exists to be exported and do nothing.
+ */
+void
+pcb_synch(void)
+{
+}
struct proc *
current_proc(void)
/* Never returns a NULL */
struct uthread * ut;
struct proc *p;
- thread_act_t thr_act = current_act();
+ thread_t thr_act = current_thread();
ut = (struct uthread *)get_bsdthread_info(thr_act);
- if (ut && (ut->uu_flag & P_VFORK) && ut->uu_proc) {
+ if (ut && (ut->uu_flag & UT_VFORK) && ut->uu_proc) {
p = ut->uu_proc;
if ((p->p_flag & P_INVFORK) == 0)
panic("returning child proc not under vfork");
sizeof(struct bdevsw)) == 0)
break;
}
+ } else {
+ /* NB: Not used below unless index is in range */
+ devsw = &bdevsw[index];
}
if ((index < 0) || (index >= nblkdev) ||
struct bdevsw *devsw;
if (index == -1) {
- devsw = bdevsw;
+ devsw = &bdevsw[1]; /* Start at slot 1 - this is a hack to fix the index=1 hack */
/* yes, start at 1 to avoid collision with volfs (Radar 2842228) */
for(index=1; index < nblkdev; index++, devsw++) {
if(memcmp((char *)devsw,
return;
}
+
+/*
+ * WARNING - this is a temporary workaround for binary compatibility issues
+ * with anti-piracy software that relies on patching ptrace (3928003).
+ * This KPI will be removed in the system release after Tiger.
+ */
+uintptr_t temp_patch_ptrace(uintptr_t new_ptrace)
+{
+ struct sysent * callp;
+ sy_call_t * old_ptrace;
+#ifndef __ppc__
+ boolean_t funnel_state;
+#endif
+
+ if (new_ptrace == 0)
+ return(0);
+
+#ifdef __ppc__
+ enter_funnel_section(kernel_flock);
+#else
+ funnel_state = thread_funnel_set(kernel_flock, TRUE);
+#endif
+ callp = &sysent[26];
+ old_ptrace = callp->sy_call;
+
+ /* only allow one patcher of ptrace */
+ if (old_ptrace == (sy_call_t *) ptrace) {
+ callp->sy_call = (sy_call_t *) new_ptrace;
+ }
+ else {
+ old_ptrace = NULL;
+ }
+#ifdef __ppc__
+ exit_funnel_section( );
+#else
+ (void)thread_funnel_set(kernel_flock, funnel_state);
+#endif
+
+ return((uintptr_t)old_ptrace);
+}
+
+void temp_unpatch_ptrace(void)
+{
+ struct sysent * callp;
+#ifndef __ppc__
+ boolean_t funnel_state;
+#endif
+
+#ifdef __ppc__
+ enter_funnel_section(kernel_flock);
+#else
+ funnel_state = thread_funnel_set(kernel_flock, TRUE);
+#endif
+ callp = &sysent[26];
+ callp->sy_call = (sy_call_t *) ptrace;
+#ifdef __ppc__
+ exit_funnel_section( );
+#else
+ (void)thread_funnel_set(kernel_flock, funnel_state);
+#endif
+
+ return;
+}
projects / apple / xnu.git / blobdiff