diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2017-12-18 18:26:49 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-12-18 18:26:49 +0000 |
| commit | c85c564d1442f0bc09a6c80fca025f004e12d044 (patch) | |
| tree | bb21cd8379494ebf6114d2daa6e97f041e318bbc | |
| parent | 368b6c8da9f8ae453f5d70f8a62dbf3f1b6d5995 (diff) | |
| download | glibc-c85c564d1442f0bc09a6c80fca025f004e12d044.tar.gz glibc-c85c564d1442f0bc09a6c80fca025f004e12d044.tar.xz glibc-c85c564d1442f0bc09a6c80fca025f004e12d044.zip | |
mips32: fix clobbering s0 in setjmp() [BZ #22624]
Similar to commit 1ab47db00dfbc0128119e3503d3ed640ffc4830b
("mips64: fix clobbering s0 in setjmp() [BZ #22624]")
as sysdeps/mips/setjmp_aux.c is almost an identical copy
of sysdeps/mips/mips64/setjmp_aux.c.
[BZ #22624]
* sysdeps/mips/setjmp_aux.c (__sigsetjmp_aux): Use
inhibit_stack_protector.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/mips/setjmp_aux.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 4a7164354f..31b25abb0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2017-12-18 Sergei Trofimovich <slyfox@gentoo.org> [BZ #22624] + * sysdeps/mips/setjmp_aux.c (__sigsetjmp_aux): Use + inhibit_stack_protector. + + [BZ #22624] * sysdeps/mips/mips64/setjmp_aux.c (__sigsetjmp_aux): Use inhibit_stack_protector. diff --git a/sysdeps/mips/setjmp_aux.c b/sysdeps/mips/setjmp_aux.c index 0052e0c4a4..176243bc51 100644 --- a/sysdeps/mips/setjmp_aux.c +++ b/sysdeps/mips/setjmp_aux.c @@ -23,7 +23,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 __attribute__ ((nomips16)) +inhibit_stack_protector __sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp) { #ifdef __mips_hard_float |