]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
um: Fix PTRACE_POKEUSER on x86_64
authorRichard Weinberger <richard@nod.at>
Fri, 31 Mar 2017 22:41:57 +0000 (00:41 +0200)
committerRichard Weinberger <richard@nod.at>
Wed, 3 May 2017 20:35:31 +0000 (22:35 +0200)
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.

Cc: <stable@vger.kernel.org>
Reported-by: jie cao <cj3054@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/x86/um/ptrace_64.c

index a5c9910d234f2f235500ecf8a2fa587eaec56f88..09a085bde0d43250f7a1f864ed49f565c71383a6 100644 (file)
@@ -125,7 +125,7 @@ int poke_user(struct task_struct *child, long addr, long data)
        else if ((addr >= offsetof(struct user, u_debugreg[0])) &&
                (addr <= offsetof(struct user, u_debugreg[7]))) {
                addr -= offsetof(struct user, u_debugreg[0]);
-               addr = addr >> 2;
+               addr = addr >> 3;
                if ((addr == 4) || (addr == 5))
                        return -EIO;
                child->thread.arch.debugregs[addr] = data;