From da45ea6bc6c7c15b4839e7e83ae8810b4c250c33 Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Sat, 7 Nov 2020 13:09:51 +0000 Subject: [PATCH] Move TDB_USERWR check under 'if (traced)'. If we hadn't been traced in the first place when syscallenter() started executing, we can ignore TDB_USERWR. TDB_USERWR can get set, sure, but if it does, it's because the debugger raced with the syscall, and it cannot depend on winning that race. Reviewed by: kib MFC after: 2 weeks Sponsored by: EPSRC Differential Revision: https://reviews.freebsd.org/D26585 --- sys/kern/subr_syscall.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index bc5dafaf921c..02e5f1b65048 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -97,21 +97,22 @@ syscallenter(struct thread *td) if (p->p_ptevents & PTRACE_SCE) ptracestop((td), SIGTRAP, NULL); PROC_UNLOCK(p); - } - if (__predict_false((td->td_dbgflags & TDB_USERWR) != 0)) { - /* - * Reread syscall number and arguments if debugger - * modified registers or memory. - */ - error = (p->p_sysent->sv_fetch_syscall_args)(td); - se = sa->callp; + + if ((td->td_dbgflags & TDB_USERWR) != 0) { + /* + * Reread syscall number and arguments if debugger + * modified registers or memory. + */ + error = (p->p_sysent->sv_fetch_syscall_args)(td); + se = sa->callp; #ifdef KTRACE - if (KTRPOINT(td, KTR_SYSCALL)) - ktrsyscall(sa->code, se->sy_narg, sa->args); + if (KTRPOINT(td, KTR_SYSCALL)) + ktrsyscall(sa->code, se->sy_narg, sa->args); #endif - if (error != 0) { - td->td_errno = error; - goto retval; + if (error != 0) { + td->td_errno = error; + goto retval; + } } }