Commit 0d669d90 authored by Richard Weinberger's avatar Richard Weinberger Committed by Ben Hutchings

um: Fix PTRACE_POKEUSER on x86_64

commit 9abc74a2 upstream.

This is broken since ever but sadly nobody noticed.
Recent versions of GDB set DR_CONTROL unconditionally and
UML dies due to a heap corruption. It turns out that
the PTRACE_POKEUSER was copy&pasted from i386 and assumes
that addresses are 4 bytes long.

Fix that by using 8 as address size in the calculation.
Reported-by: default avatarjie cao <cj3054@gmail.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 2080cbfa
...@@ -120,7 +120,7 @@ int poke_user(struct task_struct *child, long addr, long data) ...@@ -120,7 +120,7 @@ int poke_user(struct task_struct *child, long addr, long data)
else if ((addr >= offsetof(struct user, u_debugreg[0])) && else if ((addr >= offsetof(struct user, u_debugreg[0])) &&
(addr <= offsetof(struct user, u_debugreg[7]))) { (addr <= offsetof(struct user, u_debugreg[7]))) {
addr -= offsetof(struct user, u_debugreg[0]); addr -= offsetof(struct user, u_debugreg[0]);
addr = addr >> 2; addr = addr >> 3;
if ((addr == 4) || (addr == 5)) if ((addr == 4) || (addr == 5))
return -EIO; return -EIO;
child->thread.arch.debugregs[addr] = data; child->thread.arch.debugregs[addr] = data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment