diff options
| author | Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com> | 2020-08-28 17:02:46 +0530 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-09-04 14:40:42 +0200 |
| commit | 2356bb4b8221d7dc8c7beb810418122ed90254c9 (patch) | |
| tree | 4cc1ac3ba8af587ffdfcc5da8508eb97b51162dc /arch/x86/include/asm | |
| parent | ccae0f36d500aef727f98acd8d0601e6b262a513 (diff) | |
| download | linux-2356bb4b8221d7dc8c7beb810418122ed90254c9.tar.gz linux-2356bb4b8221d7dc8c7beb810418122ed90254c9.tar.bz2 linux-2356bb4b8221d7dc8c7beb810418122ed90254c9.zip | |
tracing/kprobes, x86/ptrace: Fix regs argument order for i386
On i386, the order of parameters passed on regs is eax,edx,and ecx
(as per regparm(3) calling conventions).
Change the mapping in regs_get_kernel_argument(), so that arg1=ax
arg2=dx, and arg3=cx.
Running the selftests testcase kprobes_args_use.tc shows the result
as passed.
Fixes: 3c88ee194c28 ("x86: ptrace: Add function argument access API")
Signed-off-by: Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20200828113242.GA1424@cosmos
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/ptrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index 40aa69d04862..d8324a236696 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h @@ -327,8 +327,8 @@ static inline unsigned long regs_get_kernel_argument(struct pt_regs *regs, static const unsigned int argument_offs[] = { #ifdef __i386__ offsetof(struct pt_regs, ax), - offsetof(struct pt_regs, cx), offsetof(struct pt_regs, dx), + offsetof(struct pt_regs, cx), #define NR_REG_ARGUMENTS 3 #else offsetof(struct pt_regs, di), |