x86: kprobes: fix swapped segment registers in kretprobe
authorRoland McGrath <roland@redhat.com>
Sat, 17 Jul 2010 01:17:12 +0000 (18:17 -0700)
committerRoland McGrath <roland@redhat.com>
Sun, 18 Jul 2010 22:05:34 +0000 (15:05 -0700)
In commit f007ea26, the order of the %es and %ds segment registers
got accidentally swapped, so synthesized 'struct pt_regs' frames
have the two values inverted.  It's almost sure that these values
never matter, and that they also never differ.  But wrong is wrong.

Signed-off-by: Roland McGrath <roland@redhat.com>
arch/x86/kernel/kprobes.c

index 345a4b1..675879b 100644 (file)
@@ -640,8 +640,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
        /* Skip cs, ip, orig_ax and gs. */      \
        "       subl $16, %esp\n"       \
        "       pushl %fs\n"            \
-       "       pushl %ds\n"            \
        "       pushl %es\n"            \
+       "       pushl %ds\n"            \
        "       pushl %eax\n"           \
        "       pushl %ebp\n"           \
        "       pushl %edi\n"           \