diff options
| author | Bodo Stroesser <bstroesser@fujitsu-siemens.com> | 2005-07-28 21:16:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 21:46:04 -0700 |
| commit | 9057e9deee648cb2824d83b9eb7058edb5442a21 (patch) | |
| tree | 3068f40bdee9b5bae16615b51275bdbf7b978d4a /arch/um/sys-i386/stub_segv.c | |
| parent | 6f313b12335abf010802751c45249e7a0007a232 (diff) | |
| download | kernel_samsung_aries-9057e9deee648cb2824d83b9eb7058edb5442a21.zip kernel_samsung_aries-9057e9deee648cb2824d83b9eb7058edb5442a21.tar.gz kernel_samsung_aries-9057e9deee648cb2824d83b9eb7058edb5442a21.tar.bz2 | |
[PATCH] uml: Fix skas0 stub return
It's wrong to pop a fixed number of words from stack before calling sigreturn,
as the number depends on what code is generated by the compiler for the start
of stub_segv_handler(). What we need is esp containing the address of
sigcontext. So we explicitly load that pointer into esp.
Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/sys-i386/stub_segv.c')
| -rw-r--r-- | arch/um/sys-i386/stub_segv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/sys-i386/stub_segv.c b/arch/um/sys-i386/stub_segv.c index b251442..68aeabe 100644 --- a/arch/um/sys-i386/stub_segv.c +++ b/arch/um/sys-i386/stub_segv.c @@ -21,10 +21,10 @@ stub_segv_handler(int sig) __asm__("movl %0, %%eax ; int $0x80": : "g" (__NR_getpid)); __asm__("movl %%eax, %%ebx ; movl %0, %%eax ; movl %1, %%ecx ;" "int $0x80": : "g" (__NR_kill), "g" (SIGUSR1)); - /* Pop the frame pointer and return address since we need to leave + /* Load pointer to sigcontext into esp, since we need to leave * the stack in its original form when we do the sigreturn here, by * hand. */ - __asm__("popl %%eax ; popl %%eax ; popl %%eax ; movl %0, %%eax ; " - "int $0x80" : : "g" (__NR_sigreturn)); + __asm__("mov %0,%%esp ; movl %1, %%eax ; " + "int $0x80" : : "a" (sc), "g" (__NR_sigreturn)); } |