Am 21.12.2015 um 01:03 schrieb Mickaël Salaün:
> This fix two related bugs:
> * PTRACE_GETREGS doesn't get the right orig_ax (syscall) value
> * PTRACE_SETREGS can't set the orig_ax value (erased by initial value)
>
> Remove the now useless and error-prone get_syscall().
>
> Signed-off-by: Mickaël Salaün <mic@xxxxxxxxxxx>
> Cc: Jeff Dike <jdike@xxxxxxxxxxx>
> Cc: Richard Weinberger <richard@xxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Kees Cook <keescook@xxxxxxxxxxxx>
> Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
> Cc: Will Drewry <wad@xxxxxxxxxxxx>
> Cc: Thomas Meyer <thomas@xxxxxxxx>
> Cc: Nicolas Iooss <nicolas.iooss_linux@xxxxxxx>
> Cc: Anton Ivanov <aivanov@xxxxxxxxxxx>
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: user-mode-linux-devel@xxxxxxxxxxxxxxxxxxxxx
> Cc: user-mode-linux-user@xxxxxxxxxxxxxxxxxxxxx
> Cc: Meredydd Luff <meredydd@xxxxxxxxxxxxxxx>
> Cc: David Drysdale <drysdale@xxxxxxxxxx>
> ---
> arch/um/kernel/skas/syscall.c | 7 ++++++-
> arch/um/os-Linux/skas/process.c | 7 -------
> 2 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
> index 1683b8e..65f0d1a 100644
> --- a/arch/um/kernel/skas/syscall.c
> +++ b/arch/um/kernel/skas/syscall.c
> @@ -7,6 +7,7 @@
> #include <linux/ptrace.h>
> #include <kern_util.h>
> #include <sysdep/ptrace.h>
> +#include <sysdep/ptrace_user.h>
> #include <sysdep/syscalls.h>
> #include <os.h>
>
> @@ -16,12 +17,16 @@ void handle_syscall(struct uml_pt_regs *r)
> long result;
> int syscall;
>
> + /* Save the syscall register. */
> + UPT_SYSCALL_NR(r) = PT_SYSCALL_NR(r->gp);
> +
> if (syscall_trace_enter(regs)) {
> result = -ENOSYS;
> goto out;
> }
>
> - syscall = get_syscall(r);
> + /* Get the syscall after being potentially updated with ptrace. */
> + syscall = UPT_SYSCALL_NR(r);
Doesn't this break the support for changing syscall numbers using PTRACE_SETREGS?
Thanks,
//richard
--
To unsubscribe from this list: send the line "unsubscribe linux-api" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
