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

Replace fasttrap_copyout() with uwrite(). FreeBSD copyout() is not able to

Browse Source 
write to the .text section of a process.

Obtained from:	rpaulo
MFC after:	3 days
This commit is contained in:
Ryan Stone 2011-11-07 01:55:58 +00:00
parent 166808c625
commit add89852d6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
View File

@ -97,7 +97,7 @@ uwrite(proc_t *p, void *kaddr, size_t len, uintptr_t uaddr)
return (proc_ops(UIO_WRITE, p, kaddr, uaddr, len));
}
#endif
#endif /* sun */
#ifdef __i386__
#define r_rax r_eax
#define r_rbx r_ebx
@ -1380,6 +1380,7 @@ fasttrap_pid_probe(struct reg *rp)
{
int ret = 0;
uintptr_t addr = 0;
#ifdef __amd64
if (p->p_model == DATAMODEL_NATIVE) {
addr = rp->r_rsp - sizeof (uintptr_t);
@ -1558,7 +1559,7 @@ fasttrap_pid_probe(struct reg *rp)
* ------------------------ -----
* a: <original instruction> <= 15
* jmp <pc + tp->ftt_size> 5
* b: <original instrction> <= 15
* b: <original instruction> <= 15
* int T_DTRACE_RET 2
* -----
* <= 37
@ -1731,12 +1732,16 @@ fasttrap_pid_probe(struct reg *rp)
ASSERT(i <= sizeof (scratch));
#if defined(sun)
if (fasttrap_copyout(scratch, (char *)addr, i)) {
#else
if (uwrite(curproc, scratch, i, addr)) {
#endif
fasttrap_sigtrap(p, curthread, pc);
new_pc = pc;
break;
}
if (tp->ftt_retids != NULL) {
curthread->t_dtrace_step = 1;
curthread->t_dtrace_ret = 1;