From: Wilco Dijkstra <Wilco.Dijkstra@arm.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>
Cc: Richard Sandiford <Richard.Sandiford@arm.com>
Subject: [PATCH] libgcc: Fix uninitialized RA signing on AArch64 [PR107678]
Date: Thu, 1 Dec 2022 16:55:16 +0000 [thread overview]
Message-ID: <PAWPR08MB898282DA41F5944167126D7883149@PAWPR08MB8982.eurprd08.prod.outlook.com> (raw)
A recent change only initializes the regs.how[] during Dwarf unwinding
which resulted in an uninitialized offset used in return address signing
and random failures during unwinding. The fix is to use REG_SAVED_OFFSET
as the state where the return address signing bit is valid, and if the
state is REG_UNSAVED, initialize it to 0.
Passes bootstrap & regress, OK for commit?
libgcc/
PR target/107678
* unwind-dw2.c (execute_cfa_program): Initialize offset of
DWARF_REGNUM_AARCH64_RA_STATE if in REG_UNSAVED state.
* config/aarch64/aarch64-unwind.h (aarch64_frob_update_contex):
Check state is REG_SAVED_OFFSET before using offset for RA state.
---
diff --git a/libgcc/config/aarch64/aarch64-unwind.h b/libgcc/config/aarch64/aarch64-unwind.h
index 26db9cbd9e5c526e0c410a4fc6be2bedb7d261cf..597133b3d708a50a366c8bfeff57475f5522b3f6 100644
--- a/libgcc/config/aarch64/aarch64-unwind.h
+++ b/libgcc/config/aarch64/aarch64-unwind.h
@@ -71,21 +71,15 @@ aarch64_demangle_return_addr (struct _Unwind_Context *context,
}
/* Do AArch64 private initialization on CONTEXT based on frame info FS. Mark
- CONTEXT as return address signed if bit 0 of DWARF_REGNUM_AARCH64_RA_STATE is
- set. */
+ CONTEXT as having a signed return address if DWARF_REGNUM_AARCH64_RA_STATE
+ is initialized (REG_SAVED_OFFSET state) and the offset has bit 0 set. */
static inline void
aarch64_frob_update_context (struct _Unwind_Context *context,
_Unwind_FrameState *fs)
{
- const int reg = DWARF_REGNUM_AARCH64_RA_STATE;
- int ra_signed;
- if (fs->regs.how[reg] == REG_UNSAVED)
- ra_signed = fs->regs.reg[reg].loc.offset & 0x1;
- else
- ra_signed = _Unwind_GetGR (context, reg) & 0x1;
- if (ra_signed)
- /* The flag is used for re-authenticating EH handler's address. */
+ if (fs->regs.how[DWARF_REGNUM_AARCH64_RA_STATE] == REG_SAVED_OFFSET
+ && (fs->regs.reg[DWARF_REGNUM_AARCH64_RA_STATE].loc.offset & 1) != 0)
context->flags |= RA_SIGNED_BIT;
else
context->flags &= ~RA_SIGNED_BIT;
diff --git a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
index eaceace20298b9b13344aff9d1fe9ee5f9c7bd73..87f2ae065b67982ce48f74e45523d9c754a7661c 100644
--- a/libgcc/unwind-dw2.c
+++ b/libgcc/unwind-dw2.c
@@ -1203,11 +1203,16 @@ execute_cfa_program (const unsigned char *insn_ptr,
case DW_CFA_GNU_window_save:
#if defined (__aarch64__) && !defined (__ILP32__)
- /* This CFA is multiplexed with Sparc. On AArch64 it's used to toggle
- return address signing status. */
- reg = DWARF_REGNUM_AARCH64_RA_STATE;
- gcc_assert (fs->regs.how[reg] == REG_UNSAVED);
- fs->regs.reg[reg].loc.offset ^= 1;
+ /* This CFA is multiplexed with Sparc. On AArch64 it's used to toggle
+ the return address signing status. It is initialized at the first
+ use and the state is stored in bit 0 of the offset. */
+ reg = DWARF_REGNUM_AARCH64_RA_STATE;
+ if (fs->regs.how[reg] == REG_UNSAVED)
+ {
+ fs->regs.how[reg] = REG_SAVED_OFFSET;
+ fs->regs.reg[reg].loc.offset = 0;
+ }
+ fs->regs.reg[reg].loc.offset ^= 1;
#else
/* ??? Hardcoded for SPARC register window configuration. */
if (__LIBGCC_DWARF_FRAME_REGISTERS__ >= 32)
next reply other threads:[~2022-12-01 16:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-01 16:55 Wilco Dijkstra [this message]
2022-12-05 19:04 ` Richard Sandiford
2022-12-06 10:50 ` Szabolcs Nagy
2022-12-06 11:58 ` Wilco Dijkstra
2022-12-06 21:33 ` Szabolcs Nagy
2023-01-03 17:27 ` Wilco Dijkstra
2023-01-05 14:57 ` Szabolcs Nagy
2023-01-10 16:33 ` Wilco Dijkstra
2023-01-10 18:12 ` Jakub Jelinek
2023-01-11 11:33 ` Martin Liška
2023-01-11 11:59 ` Wilco Dijkstra
2023-01-12 10:49 ` Jakub Jelinek
2023-01-12 12:05 ` Richard Sandiford
2023-01-12 12:08 ` Richard Sandiford
2023-01-12 12:28 ` Jakub Jelinek
2023-01-12 14:39 ` Jakub Jelinek
2023-01-12 15:22 ` Richard Sandiford
2023-01-12 15:34 ` Jakub Jelinek
2023-01-12 15:40 ` Richard Sandiford
2023-01-12 18:57 ` Jakub Jelinek
2023-01-16 13:04 ` Martin Liška
2023-01-17 19:49 ` Wilco Dijkstra
2023-01-17 20:43 ` Richard Sandiford
2023-01-18 12:49 ` Wilco Dijkstra
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=PAWPR08MB898282DA41F5944167126D7883149@PAWPR08MB8982.eurprd08.prod.outlook.com \
--to=wilco.dijkstra@arm.com \
--cc=Richard.Sandiford@arm.com \
--cc=gcc-patches@gcc.gnu.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).