public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com>
To: mhiramat@kernel.org, rostedt@goodmis.org, mingo@redhat.com,
	davem@davemloft.net, oleg@redhat.com, naveen.n.rao@linux.ibm.com,
	anil.s.keshavamurthy@intel.com, tglx@linutronix.de, bp@alien8.de,
	hpa@zytor.com
Cc: x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] kprobes, x86/ptrace.h: fix regs argument order for i386
Date: Fri, 28 Aug 2020 17:02:46 +0530	[thread overview]
Message-ID: <20200828113242.GA1424@cosmos> (raw)

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.

Signed-off-by: Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com>
---
 arch/x86/include/asm/ptrace.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 40aa69d..d8324a2 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),
-- 
2.7.4


             reply	other threads:[~2020-08-28 11:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-28 11:32 Vamshi K Sthambamkadi [this message]
2020-08-28 11:57 ` [PATCH] kprobes, x86/ptrace.h: fix regs argument order for i386 Masami Hiramatsu
2020-08-28 11:59 ` peterz
2020-09-04 12:49 ` [tip: x86/urgent] tracing/kprobes, x86/ptrace: Fix " tip-bot2 for Vamshi K Sthambamkadi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200828113242.GA1424@cosmos \
    --to=vamshi.k.sthambamkadi@gmail.com \
    --cc=anil.s.keshavamurthy@intel.com \
    --cc=bp@alien8.de \
    --cc=davem@davemloft.net \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@redhat.com \
    --cc=naveen.n.rao@linux.ibm.com \
    --cc=oleg@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox