| Message ID | 20230218233212.1fed456b@akathisia (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 85cc91e2ba4262a602ec65e2b76c4391a9e60d3d |
| Headers | show |
| Series | mips: fix syscall_get_nr | expand |
On Sat, Feb 18, 2023 at 11:43:59PM +0100, Elvira Khabirova wrote: > The implementation of syscall_get_nr on mips used to ignore the task > argument and return the syscall number of the calling thread instead of > the target thread. > > The bug was exposed to user space by commit 201766a20e30f ("ptrace: add > PTRACE_GET_SYSCALL_INFO request") and detected by strace test suite. > > Link: https://github.com/strace/strace/issues/235 > Fixes: c2d9f1775731 ("MIPS: Fix syscall_get_nr for the syscall exit tracing.") > Cc: <stable@vger.kernel.org> # v3.19+ > Co-developed-by: Dmitry V. Levin <ldv@strace.io> > Signed-off-by: Dmitry V. Levin <ldv@strace.io> > Signed-off-by: Elvira Khabirova <lineprinter0@gmail.com> > --- > arch/mips/include/asm/syscall.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h > index 25fa651c937d..ebdf4d910af2 100644 > --- a/arch/mips/include/asm/syscall.h > +++ b/arch/mips/include/asm/syscall.h > @@ -38,7 +38,7 @@ static inline bool mips_syscall_is_indirect(struct task_struct *task, > static inline long syscall_get_nr(struct task_struct *task, > struct pt_regs *regs) > { > - return current_thread_info()->syscall; > + return task_thread_info(task)->syscall; > } > > static inline void mips_syscall_update_nr(struct task_struct *task, > -- applied to mips-next. Thomas.
diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h index 25fa651c937d..ebdf4d910af2 100644 --- a/arch/mips/include/asm/syscall.h +++ b/arch/mips/include/asm/syscall.h @@ -38,7 +38,7 @@ static inline bool mips_syscall_is_indirect(struct task_struct *task, static inline long syscall_get_nr(struct task_struct *task, struct pt_regs *regs) { - return current_thread_info()->syscall; + return task_thread_info(task)->syscall; } static inline void mips_syscall_update_nr(struct task_struct *task,
The implementation of syscall_get_nr on mips used to ignore the task argument and return the syscall number of the calling thread instead of the target thread. The bug was exposed to user space by commit 201766a20e30f ("ptrace: add PTRACE_GET_SYSCALL_INFO request") and detected by strace test suite. Link: https://github.com/strace/strace/issues/235 Fixes: c2d9f1775731 ("MIPS: Fix syscall_get_nr for the syscall exit tracing.") Cc: <stable@vger.kernel.org> # v3.19+ Co-developed-by: Dmitry V. Levin <ldv@strace.io> Signed-off-by: Dmitry V. Levin <ldv@strace.io> Signed-off-by: Elvira Khabirova <lineprinter0@gmail.com> --- arch/mips/include/asm/syscall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --