libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix potential buffer overflow in makecontext trampoline 

glibc's tst-makecontext2 testcase uncovered a bug in
	__cont_link_context.  If the function misses to reserve
	shadow space for the calls to setcontext/cygwin_exit,
	both functions could overwrite memory beyond the stack
	configured in uc_stack.

        * exceptions.cc (__cont_link_context): x86_64: align stack and reserve
        shadow space for subsequent function calls, otherwise suffer potential
        buffer overflow.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-07-23 20:25:22 +02:00
parent 1e80973f28
commit be8183701a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2015-07-23 Corinna Vinschen <corinna@vinschen.de>
* exceptions.cc (__cont_link_context): x86_64: align stack and reserve
shadow space for subsequent function calls, otherwise suffer potential
buffer overflow.
2015-07-23 Corinna Vinschen <corinna@vinschen.de> 2015-07-23 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (cygheap_user::ontherange): Ignore $HOME if it's not * uinfo.cc (cygheap_user::ontherange): Ignore $HOME if it's not

8
winsup/cygwin/exceptions.cc
View File

@ -1929,9 +1929,14 @@ swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
is NULL, call exit. */ is NULL, call exit. */
__asm__ (" \n\ __asm__ (" \n\
.global __cont_link_context \n\ .global __cont_link_context \n\
.seh_proc __cont_link_context \n\
__cont_link_context: \n\ __cont_link_context: \n\
.seh_endprologue \n\
movq %rbx, %rsp \n\ movq %rbx, %rsp \n\
popq %rcx \n\ movq (%rsp), %rcx \n\
# align stack and subtract shadow space \n\
andq $~0xf, %rsp \n\
subq $0x20, %rsp \n\
testq %rcx, %rcx \n\ testq %rcx, %rcx \n\
je 1f \n\ je 1f \n\
call setcontext \n\ call setcontext \n\
@ -1939,6 +1944,7 @@ __cont_link_context: \n\
1: \n\ 1: \n\
call cygwin_exit \n\ call cygwin_exit \n\
nop \n\ nop \n\
.seh_endproc \n\
"); ");
#else #else