From: Aurelien Jarno <aurelien@aurel32.net>
To: libc-stable@sourceware.org
Cc: Xi Ruoyao <xry111@mengyan1223.wang>
Subject: [COMMITTED 2.34 1/2] mips: align stack in clone [BZ #28223]
Date: Tue, 14 Dec 2021 23:19:18 +0100 [thread overview]
Message-ID: <20211214221919.256237-1-aurelien@aurel32.net> (raw)
From: Xi Ruoyao <xry111@mengyan1223.wang>
The MIPS O32 ABI requires 4 byte aligned stack, and the MIPS N64 and N32
ABI require 8 byte aligned stack. Previously if the caller passed an
unaligned stack to clone the the child misbehaved.
Fixes bug 28223.
(cherry picked from commit 1f51cd9a860ee45eee8a56fb2ba925267a2a7bfe)
---
NEWS | 1 +
sysdeps/unix/sysv/linux/mips/clone.S | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/NEWS b/NEWS
index 698964bb9e..693ac78229 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ The following bugs are resolved with this release:
[19193] nptl: pthread_kill, pthread_cancel should not fail after exit
[28036] Incorrect types for pthread_mutexattr_set/getrobust_np
[28182] _TIME_BITS=64 in C++ has issues with fcntl, ioctl, prctl
+ [28223] mips: clone does not align stack
[28310] Do not use affinity mask for sysconf (_SC_NPROCESSORS_CONF)
[28340] ld.so crashes while loading a DSO with a read-only dynamic section
[28357] deadlock between pthread_create and ELF constructors
diff --git a/sysdeps/unix/sysv/linux/mips/clone.S b/sysdeps/unix/sysv/linux/mips/clone.S
index 71d9dba8bd..43a5ad3a40 100644
--- a/sysdeps/unix/sysv/linux/mips/clone.S
+++ b/sysdeps/unix/sysv/linux/mips/clone.S
@@ -55,6 +55,13 @@ NESTED(__clone,4*SZREG,sp)
.set at
#endif
+ /* Align stack to 4/8 bytes per the ABI. */
+#if _MIPS_SIM == _ABIO32
+ li t0,-4
+#else
+ li t0,-8
+#endif
+ and a1,a1,t0
/* Sanity check arguments. */
li v0,EINVAL
--
2.33.0
next reply other threads:[~2021-12-14 22:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-14 22:19 Aurelien Jarno [this message]
2021-12-14 22:19 ` [COMMITTED 2.34 2/2] mips: increase stack alignment in clone to match the ABI Aurelien Jarno
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211214221919.256237-1-aurelien@aurel32.net \
--to=aurelien@aurel32.net \
--cc=libc-stable@sourceware.org \
--cc=xry111@mengyan1223.wang \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).