| Date | Fri, 30 Jul 2010 10:52:19 -0700 | From | Greg KH <> | Subject | [122/205] x86: kprobes: fix swapped segment registers in kretprobe |
| |
2.6.34-stable review patch. If anyone has any objections, please let us know.
------------------
From: Roland McGrath <roland@redhat.com>
commit a197479848a2f1a2a5c07cffa6c31ab5e8c82797 upstream.
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- arch/x86/kernel/kprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c @@ -632,8 +632,8 @@ static int __kprobes kprobe_handler(stru /* 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" \
|