[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 07/11] coroutine-sigaltstack: Change jmp_buf to sig
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 07/11] coroutine-sigaltstack: Change jmp_buf to sigjmp_buf |
Date: |
Tue, 11 Nov 2014 17:46:29 +0300 |
From: Willem Pinckaers <address@hidden>
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 <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
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 <address@hidden>
---
coroutine-sigaltstack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/coroutine-sigaltstack.c b/coroutine-sigaltstack.c
index 3de0bb3..63519ff 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
--
1.7.10.4
- [Qemu-trivial] [PULL 00/11 for-2.2] Trivial patches for 2014-11-11, Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 01/11] icc_bus: fix typo ICC_BRIGDE -> ICC_BRIDGE, Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 02/11] qemu-doc.texi: fix typos in x509 examples, Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 07/11] coroutine-sigaltstack: Change jmp_buf to sigjmp_buf,
Michael Tokarev <=
- [Qemu-trivial] [PULL 11/11] block: Fix comment for bdrv_co_get_block_status, Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 09/11] target-i386: cpu: keeping function parameters alignment on new line, Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 10/11] sysbus: Correct SYSTEM_BUS(obj) defines, Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 05/11] gdbstub: Add a missing case of signal number translation in gdbstub, Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 03/11] slirp/smbd: modify/set several parameters in generated smbd.conf, Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 04/11] numa: make 'info numa' take into account hotplugged memory, Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 08/11] xen-hvm: Remove redundant variable 'xstate', Michael Tokarev, 2014/11/11
- [Qemu-trivial] [PULL 06/11] pc-bios: petalogix-s3adsp1800.dtb: Use 'xlnx, xps-ethernetlite-2.00.a' instead of 'xlnx, xps-ethernetlite-2.00.b', Michael Tokarev, 2014/11/11
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/11 for-2.2] Trivial patches for 2014-11-11, Peter Maydell, 2014/11/11