diff options
| -rw-r--r-- | sys/kern/kern_descrip.c | 7 | ||||
| -rw-r--r-- | sys/kern/kern_fork.c | 5 | ||||
| -rw-r--r-- | sys/kern/uipc_usrreq.c | 7 | ||||
| -rw-r--r-- | sys/sys/file.h | 4 | ||||
| -rw-r--r-- | sys/sys/proc.h | 7 | ||||
| -rw-r--r-- | sys/sys/sysctl.h | 5 |
6 files changed, 13 insertions, 22 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 1af3e946c60..a9ede923806 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_descrip.c,v 1.129 2016/03/19 12:04:15 natano Exp $ */ +/* $OpenBSD: kern_descrip.c,v 1.130 2016/04/25 20:18:31 tedu Exp $ */ /* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */ /* @@ -1036,13 +1036,12 @@ fdcopy(struct process *pr) * XXX Gruesome hack. If count gets too high, fail * to copy an fd, since fdcopy()'s callers do not * permit it to indicate failure yet. - * Meanwhile, kqueue and systrace files have to be + * Meanwhile, kqueue files have to be * tied to the process that opened them to enforce * their internal consistency, so close them here. */ if ((*fpp)->f_count == LONG_MAX-2 || - (*fpp)->f_type == DTYPE_KQUEUE || - (*fpp)->f_type == DTYPE_SYSTRACE) + (*fpp)->f_type == DTYPE_KQUEUE) fdremove(newfdp, i); else (*fpp)->f_count++; diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 16768d4e06b..a19ebae1bb1 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_fork.c,v 1.186 2016/04/25 20:00:33 tedu Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.187 2016/04/25 20:18:31 tedu Exp $ */ /* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* @@ -261,9 +261,6 @@ fork1(struct proc *curp, int flags, void *stack, pid_t *tidptr, vaddr_t uaddr; int s; struct ptrace_state *newptstat = NULL; -#if NSYSTRACE > 0 - void *newstrp = NULL; -#endif /* sanity check some flag combinations */ if (flags & FORK_THREAD) { diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 1f06ea0ca4e..3a5b7eadf4e 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_usrreq.c,v 1.96 2016/03/19 12:04:15 natano Exp $ */ +/* $OpenBSD: uipc_usrreq.c,v 1.97 2016/04/25 20:18:31 tedu Exp $ */ /* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */ /* @@ -852,9 +852,8 @@ morespace: if (error) goto fail; - /* kq and systrace descriptors cannot be copied */ - if (fp->f_type == DTYPE_KQUEUE || - fp->f_type == DTYPE_SYSTRACE) { + /* kqueue descriptors cannot be copied */ + if (fp->f_type == DTYPE_KQUEUE) { error = EINVAL; goto fail; } diff --git a/sys/sys/file.h b/sys/sys/file.h index 85f900a6806..383fe8178b3 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -1,4 +1,4 @@ -/* $OpenBSD: file.h,v 1.35 2015/08/28 04:38:47 guenther Exp $ */ +/* $OpenBSD: file.h,v 1.36 2016/04/25 20:18:31 tedu Exp $ */ /* $NetBSD: file.h,v 1.11 1995/03/26 20:24:13 jtc Exp $ */ /* @@ -69,7 +69,7 @@ struct file { #define DTYPE_PIPE 3 /* pipe */ #define DTYPE_KQUEUE 4 /* event queue */ /* was define DTYPE_CRYPTO 5 */ -#define DTYPE_SYSTRACE 6 /* system call tracing */ +/* was define DTYPE_SYSTRACE 6 */ short f_type; /* descriptor type */ long f_count; /* reference count */ struct ucred *f_cred; /* credentials associated with descriptor */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index d13ffac2ae6..ab7e63ed5fc 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.218 2016/03/29 08:46:08 mpi Exp $ */ +/* $OpenBSD: proc.h,v 1.219 2016/04/25 20:18:31 tedu Exp $ */ /* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- @@ -309,8 +309,6 @@ struct proc { struct tusage p_tu; /* accumulated times. */ struct timespec p_rtime; /* Real time. */ - void *p_systrace; /* Back pointer to systrace */ - void *p_emuldata; /* Per-process emulation data, or */ /* NULL. Malloc type M_EMULDATA */ int p_siglist; /* Signals arrived but not delivered. */ @@ -382,7 +380,6 @@ struct proc { #define P_WEXIT 0x00002000 /* Working on exiting. */ #define P_OWEUPC 0x00008000 /* Owe proc an addupc() at next ast. */ #define P_SUSPSINGLE 0x00080000 /* Need to stop for single threading. */ -#define P_SYSTRACE 0x00400000 /* Process system call tracing active*/ #define P_CONTINUED 0x00800000 /* Proc has continued from a stopped state. */ #define P_THREAD 0x04000000 /* Only a thread, not a real process */ #define P_SUSPSIG 0x08000000 /* Stopped from signal. */ @@ -392,7 +389,7 @@ struct proc { #define P_BITS \ ("\20" "\01INKTR" "\02PROFPEND" "\03ALRMPEND" "\04SIGSUSPEND" \ "\05CANTSLEEP" "\07SELECT" "\010SINTR" "\012SYSTEM" "\013TIMEOUT" \ - "\016WEXIT" "\020OWEUPC" "\024SUSPSINGLE" "\027SYSTRACE" \ + "\016WEXIT" "\020OWEUPC" "\024SUSPSINGLE" "\027XX" \ "\030CONTINUED" "\033THREAD" "\034SUSPSIG" "\035SOFTDEP" "\037CPUPEG") #define THREAD_PID_OFFSET 1000000 diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index a8c9a408a1f..f5875915822 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.159 2016/03/17 12:30:04 mpi Exp $ */ +/* $OpenBSD: sysctl.h,v 1.160 2016/04/25 20:18:31 tedu Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -721,8 +721,7 @@ struct kinfo_file { uint32_t kq_count; /* INT: number of pending events */ uint32_t kq_state; /* INT: kqueue status information */ - /* systrace information */ - uint32_t str_npolicies; /* INT: number systrace policies */ + uint32_t str_npolicies; /* INT: DEAD number systrace policies */ /* process information when retrieved via KERN_FILE_BY[PU]ID */ uint32_t p_pid; /* PID_T: process id */ |