d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- correctly set the return value for the copyin/out fault buffer to 1

Browse Source 
so setfault would return correctly when a page fault was invalid
  (e.g. a syscall with a bad parameter).

  This caused an endless DSI loop, seen when running sendmail which
  does a setlogin() call with a NULL pointer.

- introduce KTR_SYSC tracing. expose the syscallnames[] array to
  make the tracing more readable.
This commit is contained in:
Peter Grehan 2004-07-09 11:00:41 +00:00
parent eec3e03e41
commit 077a0fb8b6
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/powerpc/aim/trap.c
View File

@ -97,9 +97,7 @@ int setfault(faultbuf); /* defined in locore.S */
int badaddr(void *, size_t);
int badaddr_read(void *, size_t, int *);
#ifdef WITNESS
extern char *syscallnames[];
#endif
struct powerpc_exception {
u_int vector;
@ -321,6 +319,7 @@ handle_onfault(struct trapframe *frame)
frame->srr0 = (*fb)[0];
frame->fixreg[1] = (*fb)[1];
frame->fixreg[2] = (*fb)[2];
frame->fixreg[3] = 1;
frame->cr = (*fb)[3];
bcopy(&(*fb)[4], &frame->fixreg[13],
19 * sizeof(register_t));
@ -396,6 +395,12 @@ syscall(struct trapframe *frame)
} else
error = 0;
CTR5(KTR_SYSC, "syscall: p=%s %s(%x %x %x)", p->p_comm,
syscallnames[code],
frame->fixreg[FIRSTARG],
frame->fixreg[FIRSTARG+1],
frame->fixreg[FIRSTARG+2]);
#ifdef KTRACE
if (KTRPOINT(td, KTR_SYSCALL))
ktrsyscall(code, narg, (register_t *)params);
@ -413,6 +418,9 @@ syscall(struct trapframe *frame)
STOPEVENT(p, S_SCE, narg);
error = (*callp->sy_call)(td, params);
CTR3(KTR_SYSC, "syscall: p=%s %s ret=%x", p->p_comm,
syscallnames[code], td->td_retval[0]);
}
switch (error) {
case 0:

12
sys/powerpc/powerpc/trap.c
View File

@ -97,9 +97,7 @@ int setfault(faultbuf); /* defined in locore.S */
int badaddr(void *, size_t);
int badaddr_read(void *, size_t, int *);
#ifdef WITNESS
extern char *syscallnames[];
#endif
struct powerpc_exception {
u_int vector;
@ -321,6 +319,7 @@ handle_onfault(struct trapframe *frame)
frame->srr0 = (*fb)[0];
frame->fixreg[1] = (*fb)[1];
frame->fixreg[2] = (*fb)[2];
frame->fixreg[3] = 1;
frame->cr = (*fb)[3];
bcopy(&(*fb)[4], &frame->fixreg[13],
19 * sizeof(register_t));
@ -396,6 +395,12 @@ syscall(struct trapframe *frame)
} else
error = 0;
CTR5(KTR_SYSC, "syscall: p=%s %s(%x %x %x)", p->p_comm,
syscallnames[code],
frame->fixreg[FIRSTARG],
frame->fixreg[FIRSTARG+1],
frame->fixreg[FIRSTARG+2]);
#ifdef KTRACE
if (KTRPOINT(td, KTR_SYSCALL))
ktrsyscall(code, narg, (register_t *)params);
@ -413,6 +418,9 @@ syscall(struct trapframe *frame)
STOPEVENT(p, S_SCE, narg);
error = (*callp->sy_call)(td, params);
CTR3(KTR_SYSC, "syscall: p=%s %s ret=%x", p->p_comm,
syscallnames[code], td->td_retval[0]);
}
switch (error) {
case 0: