diff options
| author | Willem Pinckaers <willem_qemu@lekkertech.net> | 2014-11-07 19:51:59 -0800 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-11-11 11:07:55 +0300 |
| commit | 7f151e6f718f2edaf8661c4dedf6fcdb30b10e1b (patch) | |
| tree | 45317e4ef394f3d5c91ec2d5bbd3175d7671f4a0 /coroutine-sigaltstack.c | |
| parent | c21fd2c79e1fcaf45582f2dd4deb491c257aa9f2 (diff) | |
| download | qemu-7f151e6f718f2edaf8661c4dedf6fcdb30b10e1b.tar.gz | |
coroutine-sigaltstack: Change jmp_buf to sigjmp_buf
This is a simple patch to change the type of old_env from jmp_buf
to sigjmp_buf. old_env is used by sigsetjmp and as such should be
a sigjmp_buf.
This fixes a stack_chk fail in a OSX 32bit build. Since at least on
OSX sigjmp_buf is four bytes larger then a jmpbuf, resulting in an
overflow in sigsetjmp. Due to variable reordering this overwrites
the stack cookie.
Signed-off-by: Willem Pinckaers <willem_qemu@lekkertech.net>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Peter: I think I must have missed this one when I converted
all the jmp_buf to sigjmp_buf in commit 6ab7e546.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'coroutine-sigaltstack.c')
| -rw-r--r-- | coroutine-sigaltstack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coroutine-sigaltstack.c b/coroutine-sigaltstack.c index 3de0bb33bd..63519fffc7 100644 --- a/coroutine-sigaltstack.c +++ b/coroutine-sigaltstack.c @@ -155,7 +155,7 @@ Coroutine *qemu_coroutine_new(void) stack_t oss; sigset_t sigs; sigset_t osigs; - jmp_buf old_env; + sigjmp_buf old_env; /* The way to manipulate stack is with the sigaltstack function. We * prepare a stack, with it delivering a signal to ourselves and then |