AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 05:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm: Fix an incorrect check in ____longjmp_chk [BZ #27709]

Browse Source 
An incorrect check in __longjmp_chk could fail on valid code causing

FAIL: debug/tst-longjmp_chk2

The original check was

  altstack_sp + altstack_size - setjmp_sp > altstack_size

i.e. sp at setjmp was outside of the altstack range. Here we know that
longjmp is called from a signal handler on the altstack (SS_ONSTACK),
and that it jumps in the wrong direction (sp decreases), so the check
wants to ensure the jump goes to another stack.

The check is wrong when altstack_sp == setjmp_sp which can happen
when the altstack is a local buffer in the function that calls setjmp,
so the patch allows == too. This fixes bug 27709.

Note that the generic __longjmp_chk check seems to be different.
(it checks if longjmp was on the altstack but does not check setjmp,
so it would not catch incorrect longjmp use within the signal handler).
This commit is contained in:
Szabolcs Nagy 2021-04-07 12:45:53 +01:00
parent 9f1bed18f9
commit 8d4d77f6c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysdeps/unix/sysv/linux/arm/____longjmp_chk.S
View File

@ -72,8 +72,8 @@ longjmp_msg:
ldr r3, [sp, #8]; \ ldr r3, [sp, #8]; \
add r2, r2, r3; \ add r2, r2, r3; \
sub r2, r2, reg; \ sub r2, r2, reg; \
cmp r2, r3; \ cmp r3, r2; \
bhi .Lok2; \ bls .Lok2; \
.Lfail: \ .Lfail: \
add sp, sp, #12; \ add sp, sp, #12; \
cfi_adjust_cfa_offset (-12); \ cfi_adjust_cfa_offset (-12); \