um: Fix ptrace GETREGS/SETREGS bugs
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) Get rid of the now useless and error-prone get_syscall(). Fix inconsistent behavior in the ptrace implementation for i386 when updating orig_eax automatically update the syscall number as well. This is now updated in handle_syscall(). Signed-off-by: Mickaël Salaün <mic@digikod.net> Cc: Jeff Dike <jdike@addtoit.com> Cc: Richard Weinberger <richard@nod.at> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Kees Cook <keescook@chromium.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Will Drewry <wad@chromium.org> Cc: Thomas Meyer <thomas@m3y3r.de> Cc: Nicolas Iooss <nicolas.iooss_linux@m4x.org> Cc: Anton Ivanov <aivanov@brocade.com> Cc: Meredydd Luff <meredydd@senatehouse.org> Cc: David Drysdale <drysdale@google.com> Signed-off-by: Richard Weinberger <richard@nod.at> Acked-by: Kees Cook <keescook@chromium.org>
这个提交包含在:
@@ -68,6 +68,7 @@ static const int reg_offsets[] = {
|
||||
[EFL] = HOST_EFLAGS,
|
||||
[UESP] = HOST_SP,
|
||||
[SS] = HOST_SS,
|
||||
[ORIG_EAX] = HOST_ORIG_AX,
|
||||
};
|
||||
|
||||
int putreg(struct task_struct *child, int regno, unsigned long value)
|
||||
@@ -83,6 +84,7 @@ int putreg(struct task_struct *child, int regno, unsigned long value)
|
||||
case EAX:
|
||||
case EIP:
|
||||
case UESP:
|
||||
case ORIG_EAX:
|
||||
break;
|
||||
case FS:
|
||||
if (value && (value & 3) != 3)
|
||||
@@ -108,9 +110,6 @@ int putreg(struct task_struct *child, int regno, unsigned long value)
|
||||
value &= FLAG_MASK;
|
||||
child->thread.regs.regs.gp[HOST_EFLAGS] |= value;
|
||||
return 0;
|
||||
case ORIG_EAX:
|
||||
child->thread.regs.regs.syscall = value;
|
||||
return 0;
|
||||
default :
|
||||
panic("Bad register in putreg() : %d\n", regno);
|
||||
}
|
||||
@@ -143,8 +142,6 @@ unsigned long getreg(struct task_struct *child, int regno)
|
||||
|
||||
regno >>= 2;
|
||||
switch (regno) {
|
||||
case ORIG_EAX:
|
||||
return child->thread.regs.regs.syscall;
|
||||
case FS:
|
||||
case GS:
|
||||
case DS:
|
||||
@@ -163,6 +160,7 @@ unsigned long getreg(struct task_struct *child, int regno)
|
||||
case EDI:
|
||||
case EBP:
|
||||
case EFL:
|
||||
case ORIG_EAX:
|
||||
break;
|
||||
default:
|
||||
panic("Bad register in getreg() : %d\n", regno);
|
||||
|
在新工单中引用
屏蔽一个用户