From: Szabolcs Nagy <szabolcs.nagy@arm.com>
To: <libc-alpha@sourceware.org>
Subject: [PATCH 04/20] aarch64: Fix the extension header write in getcontext and swapcontext
Date: Thu, 27 Oct 2022 16:32:24 +0100 [thread overview]
Message-ID: <4f72249e1bd2b5a772973f9faf3b88e62596fdde.1666877952.git.szabolcs.nagy@arm.com> (raw)
In-Reply-To: <cover.1666877952.git.szabolcs.nagy@arm.com>
The extension header is two 32bit words and in the last header both
should be 0. There is plenty space in the __reserved area, but it's
better not to write more than we mean to.
---
sysdeps/unix/sysv/linux/aarch64/getcontext.S | 4 ++--
sysdeps/unix/sysv/linux/aarch64/swapcontext.S | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/aarch64/getcontext.S b/sysdeps/unix/sysv/linux/aarch64/getcontext.S
index 15fbd2d1a0..3109cbd99a 100644
--- a/sysdeps/unix/sysv/linux/aarch64/getcontext.S
+++ b/sysdeps/unix/sysv/linux/aarch64/getcontext.S
@@ -86,8 +86,8 @@ ENTRY(__getcontext)
/* Write the termination context extension header. */
add x2, x2, #FPSIMD_CONTEXT_SIZE
- str xzr, [x2, #oHEAD + oMAGIC]
- str xzr, [x2, #oHEAD + oSIZE]
+ str wzr, [x2, #oHEAD + oMAGIC]
+ str wzr, [x2, #oHEAD + oSIZE]
/* Grab the signal mask */
/* rt_sigprocmask (SIG_BLOCK, NULL, &ucp->uc_sigmask, _NSIG8) */
diff --git a/sysdeps/unix/sysv/linux/aarch64/swapcontext.S b/sysdeps/unix/sysv/linux/aarch64/swapcontext.S
index 1ee2e40272..e3ec9da35d 100644
--- a/sysdeps/unix/sysv/linux/aarch64/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/aarch64/swapcontext.S
@@ -75,8 +75,8 @@ ENTRY(__swapcontext)
/* Write the termination context extension header. */
add x2, x2, #FPSIMD_CONTEXT_SIZE
- str xzr, [x2, #oHEAD + oMAGIC]
- str xzr, [x2, #oHEAD + oSIZE]
+ str wzr, [x2, #oHEAD + oMAGIC]
+ str wzr, [x2, #oHEAD + oSIZE]
/* Preserve ucp. */
mov x21, x1
--
2.25.1
next prev parent reply other threads:[~2022-10-27 15:32 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 15:32 [PATCH 00/20] patches from the morello port Szabolcs Nagy
2022-10-27 15:32 ` [PATCH 01/20] Fix OOB read in stdlib thousand grouping parsing [BZ #29727] Szabolcs Nagy
2022-10-27 15:38 ` Andreas Schwab
2022-10-27 15:32 ` [PATCH 02/20] scripts: Use bool in tunables initializer Szabolcs Nagy
2022-10-27 16:29 ` Florian Weimer
2022-10-27 15:32 ` [PATCH 03/20] aarch64: Don't build wordcopy Szabolcs Nagy
2022-10-27 16:59 ` Adhemerval Zanella Netto
2022-10-27 15:32 ` Szabolcs Nagy [this message]
2022-10-28 14:03 ` [PATCH 04/20] aarch64: Fix the extension header write in getcontext and swapcontext Adhemerval Zanella Netto
2022-10-27 15:32 ` [PATCH 05/20] Fix invalid pointer dereference in wcscpy_chk Szabolcs Nagy
2022-10-28 5:34 ` Florian Weimer
2022-10-27 15:32 ` [PATCH 06/20] Fix invalid pointer dereference in wcpcpy_chk Szabolcs Nagy
2022-10-28 5:45 ` Florian Weimer
2022-10-27 15:32 ` [PATCH 07/20] Use uintptr_t in fts for pointer alignment Szabolcs Nagy
2022-10-31 16:08 ` Adhemerval Zanella Netto
2022-10-27 15:32 ` [PATCH 08/20] malloc: Use uintptr_t " Szabolcs Nagy
2022-10-31 16:09 ` Adhemerval Zanella Netto
2022-10-27 15:32 ` [PATCH 09/20] malloc: Use uintptr_t in alloc_buffer Szabolcs Nagy
2022-10-27 16:15 ` Florian Weimer
2022-10-27 15:33 ` [PATCH 10/20] malloc: Fix alignment logic in obstack Szabolcs Nagy
2022-10-31 16:14 ` Adhemerval Zanella Netto
2022-11-01 9:43 ` Szabolcs Nagy
2022-11-01 13:07 ` Adhemerval Zanella Netto
2022-10-27 15:33 ` [PATCH 11/20] elf: Fix alloca size in _dl_debug_vdprintf Szabolcs Nagy
2022-10-28 5:31 ` Florian Weimer
2022-10-28 13:56 ` Adhemerval Zanella Netto
2022-10-28 14:43 ` Szabolcs Nagy
2022-10-28 14:48 ` Adhemerval Zanella Netto
2022-10-27 15:33 ` [PATCH 12/20] Fix the symbolic link of multilib dirs Szabolcs Nagy
2022-10-27 15:33 ` [PATCH 13/20] Use uintptr_t in string/tester for pointer alignment Szabolcs Nagy
2022-10-28 14:11 ` Adhemerval Zanella Netto
2022-10-27 15:33 ` [PATCH 14/20] Fix off-by-one OOB write in iconv/tst-iconv-mt Szabolcs Nagy
2022-10-28 5:39 ` Florian Weimer
2022-10-27 15:33 ` [PATCH 15/20] Fix off-by-one OOB read in elf/tst-tls20 Szabolcs Nagy
2022-10-28 5:36 ` Florian Weimer
2022-10-27 15:33 ` [PATCH 16/20] Fix malloc/tst-scratch_buffer OOB access Szabolcs Nagy
2022-10-28 5:41 ` Florian Weimer
2022-10-28 11:24 ` Szabolcs Nagy
2022-10-28 11:30 ` Florian Weimer
2022-10-28 12:23 ` Szabolcs Nagy
2022-10-28 12:27 ` Florian Weimer
2022-10-27 15:33 ` [PATCH 17/20] Fix missing NUL terminator in stdio-common/scanf13 test Szabolcs Nagy
2022-10-28 5:44 ` Florian Weimer
2022-10-27 15:33 ` [PATCH 18/20] Fix elf/tst-dlmopen-twice to support enough link namespaces Szabolcs Nagy
2022-10-27 16:24 ` Florian Weimer
2022-10-27 16:45 ` Szabolcs Nagy
2022-10-27 16:51 ` Florian Weimer
2022-10-27 16:47 ` Adhemerval Zanella Netto
2022-10-27 15:33 ` [PATCH 19/20] Fix resource/bug-ulimit1 test Szabolcs Nagy
2022-10-27 16:48 ` Adhemerval Zanella Netto
2022-10-27 15:34 ` [PATCH 20/20] Fix stdlib/test-dlclose-exit-race to not hang Szabolcs Nagy
2022-10-27 16:22 ` Florian Weimer
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=4f72249e1bd2b5a772973f9faf3b88e62596fdde.1666877952.git.szabolcs.nagy@arm.com \
--to=szabolcs.nagy@arm.com \
--cc=libc-alpha@sourceware.org \
/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).