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

Fixes for ptrace_syscallreq()

Browse Source 
Re-assign the sc local (syscall number) before moving args for SYS_syscall.
Correct the audit and kdtrace hooks invocations.

Fixes:	140ceb5d956bb8795a77c23d3fd5ef047b0f3c68
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2022-12-23 01:51:34 +02:00
parent 6403a14024
commit 974be51b3f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/kern_sig.c
View File

@ -2672,6 +2672,7 @@ ptrace_syscallreq(struct thread *td, struct proc *p,
sc = tsr->ts_sa.code;
if (sc == SYS_syscall || sc == SYS___syscall) {
sc = tsr->ts_sa.args[0];
memmove(&tsr->ts_sa.args[0], &tsr->ts_sa.args[1],
sizeof(register_t) * (tsr->ts_nargs - 1));
}
@ -2692,7 +2693,7 @@ ptrace_syscallreq(struct thread *td, struct proc *p,
#endif
sy_thr_static = (se->sy_thrcnt & SY_THR_STATIC) != 0;
audited = AUDIT_SYSCALL_ENTER(tsr->ts_syscall, td) != 0;
audited = AUDIT_SYSCALL_ENTER(sc, td) != 0;
if (!sy_thr_static) {
error = syscall_thread_enter(td, se);
@ -2716,7 +2717,7 @@ ptrace_syscallreq(struct thread *td, struct proc *p,
#ifdef KDTRACE_HOOKS
if (se->sy_return != 0)
(*systrace_probe_func)(&tsr->ts_sa, SYSTRACE_RETURN,
tsr->ts_ret->sr_error != 0 ? -1 : td->td_retval[0]);
tsr->ts_ret.sr_error != 0 ? -1 : td->td_retval[0]);
#endif
tsr->ts_ret.sr_retval[0] = td->td_retval[0];