1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
|
$NetBSD: patch-an,v 1.1 2006/03/05 08:17:49 christos Exp $
--- syscall.c 2006-01-12 05:18:53.000000000 -0500
+++ syscall.c 2006-03-05 01:59:19.000000000 -0500
@@ -38,9 +38,9 @@
#include <signal.h>
#include <time.h>
#include <errno.h>
+#include <sys/param.h>
#include <sys/user.h>
#include <sys/syscall.h>
-#include <sys/param.h>
#if HAVE_ASM_REG_H
#if defined (SPARC) || defined (SPARC64)
@@ -56,6 +56,10 @@
#endif
#endif
+#ifdef NETBSD
+#include <machine/reg.h>
+#include <x86/psl.h>
+#endif
#ifdef HAVE_SYS_REG_H
#include <sys/reg.h>
#ifndef PTRACE_PEEKUSR
@@ -200,6 +204,7 @@
set_personality(personality)
int personality;
{
+printf("setpersonality %d\n", personality);
switch (personality) {
case 0:
errnoent = errnoent0;
@@ -634,6 +639,7 @@
}
#endif
+#ifndef NETBSD
static void
decode_subcall(tcp, subcall, nsubcalls, style)
struct tcb *tcp;
@@ -719,6 +725,7 @@
#endif /* FREEBSD */
}
}
+#endif /* !NETBSD */
#endif
struct tcb *tcp_last = NULL;
@@ -855,9 +862,9 @@
static long rax;
#endif
#endif /* LINUX */
-#ifdef FREEBSD
- struct reg regs;
-#endif /* FREEBSD */
+#ifdef ALLBSD
+ static struct reg regs;
+#endif /* ALLBSD */
int
get_scno(tcp)
@@ -1318,9 +1325,9 @@
#ifdef HAVE_PR_SYSCALL
scno = tcp->status.PR_SYSCALL;
#else /* !HAVE_PR_SYSCALL */
-#ifndef FREEBSD
+#ifndef ALLBSD
scno = tcp->status.PR_WHAT;
-#else /* FREEBSD */
+#else /* ALLBSD */
if (pread(tcp->pfd_reg, ®s, sizeof(regs), 0) < 0) {
perror("pread");
return -1;
@@ -1334,8 +1341,28 @@
scno = regs.r_eax;
break;
}
-#endif /* FREEBSD */
+#endif /* ALLBSD */
#endif /* !HAVE_PR_SYSCALL */
+#else /* !USE_PROCFS */
+#ifdef NETBSD
+ if (ptrace(PTRACE_GETREGS,pid,(char *)®s, 0) < 0) {
+ perror("GETREGS");
+ return -1;
+ }
+ switch (regs.r_eax) {
+ case SYS_syscall:
+ case SYS___syscall:
+ if ((scno = ptrace(PTRACE_PEEKUSER, pid,
+ (char *)regs.r_esp + sizeof(int), sizeof(int))) == -1) {
+ perror("PEEKUSER __syscall");
+ return -1;
+ }
+ break;
+ default:
+ scno = regs.r_eax;
+ break;
+ }
+#endif /* NETBSD */
#endif /* USE_PROCFS */
if (!(tcp->flags & TCB_INSYSCALL))
tcp->scno = scno;
@@ -1360,7 +1387,9 @@
struct tcb *tcp;
{
#ifndef USE_PROCFS
+#ifndef NETBSD
int pid = tcp->pid;
+#endif
#else /* USE_PROCFS */
int scno = known_scno(tcp);
@@ -1733,7 +1762,7 @@
}
#endif /* MIPS */
#endif /* SVR4 */
-#ifdef FREEBSD
+#ifdef ALLBSD
if (regs.r_eflags & PSL_C) {
tcp->u_rval = -1;
u_error = regs.r_eax;
@@ -1743,7 +1772,7 @@
((unsigned long long) regs.r_edx << 32) + regs.r_eax;
u_error = 0;
}
-#endif /* FREEBSD */
+#endif /* ALLBSD */
tcp->u_error = u_error;
return 1;
}
@@ -1926,6 +1955,20 @@
return -1;
}
#endif /* FREEBSD */
+#ifdef NETBSD
+ if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)®s, 0) < 0)
+ return -1;
+ if (error) {
+ regs.r_eflags |= PSL_C;
+ regs.r_eax = error;
+ }
+ else {
+ regs.r_eflags &= ~PSL_C;
+ regs.r_eax = rval;
+ }
+ if (ptrace(PTRACE_SETREGS, tcp->pid, (char *)®s, 0) < 0)
+ return -1;
+#endif
/* All branches reach here on success (only). */
tcp->u_error = error;
@@ -1938,7 +1981,9 @@
struct tcb *tcp;
{
#ifndef USE_PROCFS
+#ifndef NETBSD
int pid = tcp->pid;
+#endif
#endif /* !USE_PROCFS */
#ifdef LINUX
#if defined(S390) || defined(S390X)
@@ -2236,6 +2281,29 @@
I DONT KNOW WHAT TO DO
#endif /* !HAVE_PR_SYSCALL */
#endif /* SVR4 */
+#ifdef NETBSD
+ if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1)
+ tcp->u_nargs = sysent[tcp->scno].nargs;
+ else
+ tcp->u_nargs = 5;
+ switch(regs.r_eax) {
+ case SYS___syscall:
+ umoven(tcp, regs.r_esp + sizeof(int) + sizeof(quad_t),
+ tcp->u_nargs * sizeof(unsigned long),
+ (char *) tcp->u_arg);
+ break;
+ case SYS_syscall:
+ umoven(tcp, regs.r_esp + 2 * sizeof(int),
+ tcp->u_nargs * sizeof(unsigned long),
+ (char *) tcp->u_arg);
+ break;
+ default:
+ umoven(tcp, regs.r_esp + sizeof(int),
+ tcp->u_nargs * sizeof(unsigned long),
+ (char *) tcp->u_arg);
+ break;
+ }
+#endif /* NETBSD */
#ifdef FREEBSD
if (tcp->scno >= 0 && tcp->scno < nsyscalls &&
sysent[tcp->scno].nargs > tcp->status.val)
@@ -2648,6 +2716,14 @@
pread(tcp->pfd_reg, ®s, sizeof(regs), 0);
val = regs.r_edx;
#endif
+#ifdef NETBSD
+ struct reg regs;
+ if (ptrace(PTRACE_GETREGS, tcp->pid, (char *)®s, sizeof(regs)) < 0) {
+ perror("PTRACE_GETREGS get edx");
+ return -1;
+ }
+ val = regs.r_edx;
+#endif
return val;
}
|
