diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-07-18 15:08:03 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-07-18 15:08:03 +0200 |
| commit | 115bcf921a52005b89ff2859ccae4a8fc6d6deed (patch) | |
| tree | f29c4f3cd3674f5102885e19d7ee70235c709edf | |
| parent | e9422236a2dd4cf2b7e900af5e84706da68bd43e (diff) | |
| download | glibc-115bcf921a52005b89ff2859ccae4a8fc6d6deed.zip glibc-115bcf921a52005b89ff2859ccae4a8fc6d6deed.tar.gz glibc-115bcf921a52005b89ff2859ccae4a8fc6d6deed.tar.bz2 | |
hurd: Fix longjmp early in initialization
When e.g. an LD_PRELOAD fails, _dl_signal_exception/error longjmps, but TLS
is not initialized yet, let along signal state. We thus mustn't look at
them within __longjmp.
* sysdeps/mach/hurd/i386/____longjmp_chk.S,__longjmp.S: Check for
initialized value of %gs, and that sigstate is non-NULL.
| -rw-r--r-- | sysdeps/mach/hurd/i386/____longjmp_chk.S | 9 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/__longjmp.S | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/sysdeps/mach/hurd/i386/____longjmp_chk.S b/sysdeps/mach/hurd/i386/____longjmp_chk.S index 4d3a331..5131386 100644 --- a/sysdeps/mach/hurd/i386/____longjmp_chk.S +++ b/sysdeps/mach/hurd/i386/____longjmp_chk.S @@ -60,7 +60,14 @@ ENTRY (____longjmp_chk) PTR_DEMANGLE (%ecx) #endif - movl %gs:SIGSTATE_OFFSET,%edi + movw %ds, %si + movw %gs, %di + cmpw %si, %di + jz .Lok /* TLS not initialized yet */ + + movl %gs:SIGSTATE_OFFSET, %edi + testl %edi, %edi + jnz .Lok /* sigstate not initialized yet */ testl $SS_ONSTACK, (HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_FLAGS__OFFSET)(%edi) jnz .Lonstack diff --git a/sysdeps/mach/hurd/i386/__longjmp.S b/sysdeps/mach/hurd/i386/__longjmp.S index d123c21..73bbff9 100644 --- a/sysdeps/mach/hurd/i386/__longjmp.S +++ b/sysdeps/mach/hurd/i386/__longjmp.S @@ -38,7 +38,14 @@ ENTRY (__longjmp) PTR_DEMANGLE (%ecx) #endif - movl %gs:SIGSTATE_OFFSET,%edi + movw %ds, %si + movw %gs, %di + cmpw %si, %di + jz .Lok /* TLS not initialized yet */ + + movl %gs:SIGSTATE_OFFSET, %edi + testl %edi, %edi + jnz .Lok /* sigstate not initialized yet */ testl $SS_ONSTACK, (HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_FLAGS__OFFSET)(%edi) jz .Lok |