Skip to contentSkip to conversation

MIPS: Fix syscall_trace_enter compilation error

PATCH In review Tony Wu 2 participants 2 messages Feb 5, 2015 – Feb 12, 2015

Subsystems (2)
MIPS ptrace support
lore
Share & tools
lore

Tony Wu

author
#0 lore raw

PATCH 1/1 MIPS: Fix syscall_trace_enter compilation error

Commit cf6ce084 (MIPS: Fix syscall_get_nr for the syscall exit tracing.) broke 3.13 and 3.14 stable tree due to the missing syscall argument. So, get the syscall from regs[2] before it's trashed.

This patch should go to the 3.13 and 3.14 stable tree.

Signed-off-by Tony Wu <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Lars Persson <[email protected]>
Cc [email protected]
arch/mips/kernel/ptrace.c +1 -1
index 64e18f9..01f1413 100644
@@ -799,7 +799,7 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
 	long ret = 0;
 	user_exit();
 
-	current_thread_info()->syscall = syscall;
+	current_thread_info()->syscall = regs->regs[2];
 
 	/* do the secure computing check first */
 	secure_computing_strict(regs->regs[2]);
#1 lore raw
Quoted 17 lines · Tony Wu

Commit cf6ce084 (MIPS: Fix syscall_get_nr for the syscall exit tracing.) broke 3.13 and 3.14 stable tree due to the missing syscall argument. So, get the syscall from regs[2] before it's trashed.

This patch should go to the 3.13 and 3.14 stable tree.

Signed-off-by Tony Wu <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Lars Persson <[email protected]>
Cc [email protected]
arch/mips/kernel/ptrace.c +0 -0
index 64e18f9..01f1413 100644

arch/mips/kernel/ptrace.c asmlinkage void syscall_trace_enter(struct pt_regs *regs) · line 805

Quoted 8 lines
arch/mips/kernel/ptrace.c +1 -1
@@ -799,7 +799,7 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
 	long ret = 0;
 	user_exit();
 
-	current_thread_info()->syscall = syscall;
+	current_thread_info()->syscall = regs->regs[2];
 
 	/* do the secure computing check first */
 	secure_computing_strict(regs->regs[2]);

Hi,

Commit cf6ce084 (MIPS: Fix syscall_get_nr for the syscall exit..) is not in the stable branches. How did it brake the 3.13 and 3.14 build?

Signature · 1 line
markos