diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/mips/mips64/setjmp_aux.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index d290d60a84..4a7164354f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-12-18 Sergei Trofimovich <slyfox@gentoo.org> + + [BZ #22624] + * sysdeps/mips/mips64/setjmp_aux.c (__sigsetjmp_aux): Use + inhibit_stack_protector. + 2017-12-18 Dmitry V. Levin <ldv@altlinux.org> [BZ #22627] diff --git a/sysdeps/mips/mips64/setjmp_aux.c b/sysdeps/mips/mips64/setjmp_aux.c index b43c36a7d5..43fffc74bf 100644 --- a/sysdeps/mips/mips64/setjmp_aux.c +++ b/sysdeps/mips/mips64/setjmp_aux.c @@ -24,7 +24,12 @@ pointer. We do things this way because it's difficult to reliably access them in C. */ +/* Stack protection is disabled to avoid changing s0 (or any other + caller-save register) before storing it to environment. + See BZ #22624. */ + int +inhibit_stack_protector __sigsetjmp_aux (jmp_buf env, int savemask, long long sp, long long fp, long long gp) { |