From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Mon, 18 Dec 2017 18:26:49 +0000 (+0000)
Subject: mips32: fix clobbering s0 in setjmp() [BZ #22624]
X-Git-Tag: glibc-2.27~259
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c85c564d1442f0bc09a6c80fca025f004e12d044;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 4a7164354f2..31b25abb0ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 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 0052e0c4a4d..176243bc510 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