From: "Torbjörn SVENSSON" <torbjorn.svensson@foss.st.com>
To: <gdb-patches@sourceware.org>
Cc: luis.machado@arm.com, vanekt@volny.cz,
"Torbjörn SVENSSON" <torbjorn.svensson@foss.st.com>
Subject: [PATCH v2 2/4] gdb/arm: Ensure that stack pointers are in sync
Date: Fri, 18 Nov 2022 16:52:51 +0100 [thread overview]
Message-ID: <20221118155252.113476-3-torbjorn.svensson@foss.st.com> (raw)
In-Reply-To: <20221118155252.113476-1-torbjorn.svensson@foss.st.com>
Without this patch, sp might be secure, but msp or psp is non-secure
(this state can not happen in the hardware).
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
---
gdb/arm-tdep.c | 86 ++++++++++++++++++++++++++++++++++----------------
1 file changed, 58 insertions(+), 28 deletions(-)
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 124a94dc87d..c011b2aa973 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -324,20 +324,6 @@ reconstruct_t_bit(struct gdbarch *gdbarch, CORE_ADDR lr, ULONGEST psr)
return psr;
}
-/* Initialize stack pointers, and flag the active one. */
-
-static inline void
-arm_cache_init_sp (int regnum, CORE_ADDR* member,
- struct arm_prologue_cache *cache,
- frame_info_ptr frame)
-{
- CORE_ADDR val = get_frame_register_unsigned (frame, regnum);
- if (val == cache->sp)
- cache->active_sp_regnum = regnum;
-
- *member = val;
-}
-
/* Initialize CACHE fields for which zero is not adequate (CACHE is
expected to have been ZALLOC'ed before calling this function). */
@@ -362,34 +348,78 @@ arm_cache_init (struct arm_prologue_cache *cache, frame_info_ptr frame)
if (tdep->have_sec_ext)
{
- CORE_ADDR msp_val = get_frame_register_unsigned (frame, tdep->m_profile_msp_regnum);
- CORE_ADDR psp_val = get_frame_register_unsigned (frame, tdep->m_profile_psp_regnum);
-
- arm_cache_init_sp (tdep->m_profile_msp_s_regnum, &cache->msp_s, cache, frame);
- arm_cache_init_sp (tdep->m_profile_psp_s_regnum, &cache->psp_s, cache, frame);
- arm_cache_init_sp (tdep->m_profile_msp_ns_regnum, &cache->msp_ns, cache, frame);
- arm_cache_init_sp (tdep->m_profile_psp_ns_regnum, &cache->psp_ns, cache, frame);
-
+ const CORE_ADDR msp_val
+ = get_frame_register_unsigned (frame, tdep->m_profile_msp_regnum);
+ const CORE_ADDR psp_val
+ = get_frame_register_unsigned (frame, tdep->m_profile_psp_regnum);
+
+ cache->msp_s
+ = get_frame_register_unsigned (frame, tdep->m_profile_msp_s_regnum);
+ cache->msp_ns
+ = get_frame_register_unsigned (frame, tdep->m_profile_msp_ns_regnum);
+ cache->psp_s
+ = get_frame_register_unsigned (frame, tdep->m_profile_psp_s_regnum);
+ cache->psp_ns
+ = get_frame_register_unsigned (frame, tdep->m_profile_psp_ns_regnum);
+
+ /* Identify what msp is alias for (msp_s or msp_ns). */
if (msp_val == cache->msp_s)
cache->active_msp_regnum = tdep->m_profile_msp_s_regnum;
else if (msp_val == cache->msp_ns)
cache->active_msp_regnum = tdep->m_profile_msp_ns_regnum;
+ else
+ {
+ warning (_("Invalid state, unable to determine msp alias."));
+ cache->active_msp_regnum = tdep->m_profile_msp_s_regnum;
+ }
+
+ /* Identify what psp is alias for (psp_s or psp_ns). */
if (psp_val == cache->psp_s)
cache->active_psp_regnum = tdep->m_profile_psp_s_regnum;
else if (psp_val == cache->psp_ns)
cache->active_psp_regnum = tdep->m_profile_psp_ns_regnum;
+ else
+ {
+ warning (_("Invalid state, unable to determine psp alias."));
+ cache->active_psp_regnum = tdep->m_profile_psp_s_regnum;
+ }
- /* Use MSP_S as default stack pointer. */
- if (cache->active_sp_regnum == ARM_SP_REGNUM)
- cache->active_sp_regnum = tdep->m_profile_msp_s_regnum;
+ /* Identify what sp is alias for (msp_s, msp_ns, psp_s or psp_ns). */
+ if (msp_val == cache->sp)
+ cache->active_sp_regnum = cache->active_msp_regnum;
+ else if (psp_val == cache->sp)
+ cache->active_sp_regnum = cache->active_psp_regnum;
+ else
+ {
+ warning (_("Invalid state, unable to determine sp alias."));
+ cache->active_sp_regnum = cache->active_msp_regnum;
+ }
}
else if (tdep->is_m)
{
- arm_cache_init_sp (tdep->m_profile_msp_regnum, &cache->msp_s, cache, frame);
- arm_cache_init_sp (tdep->m_profile_psp_regnum, &cache->psp_s, cache, frame);
+ cache->msp_s
+ = get_frame_register_unsigned (frame, tdep->m_profile_msp_s_regnum);
+ cache->psp_s
+ = get_frame_register_unsigned (frame, tdep->m_profile_psp_s_regnum);
+
+ /* Identify what sp is alias for (msp or psp). */
+ if (cache->msp_s == cache->sp)
+ cache->active_sp_regnum = tdep->m_profile_msp_regnum;
+ else if (cache->psp_s == cache->sp)
+ cache->active_sp_regnum = tdep->m_profile_psp_regnum;
+ else
+ {
+ warning (_("Invalid state, unable to determine sp alias."));
+ cache->active_sp_regnum = tdep->m_profile_msp_regnum;
+ }
}
else
- arm_cache_init_sp (ARM_SP_REGNUM, &cache->msp_s, cache, frame);
+ {
+ cache->msp_s
+ = get_frame_register_unsigned (frame, ARM_SP_REGNUM);
+
+ cache->active_sp_regnum = ARM_SP_REGNUM;
+ }
}
/* Return the requested stack pointer value (in REGNUM), taking into
--
2.25.1
next prev parent reply other threads:[~2022-11-18 15:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 15:52 [PATCH 0/4] v2 gdb/arm: Fixes for Cortex-M stack unwinding Torbjörn SVENSSON
2022-11-18 15:52 ` [PATCH v2 1/4] gdb/arm: Update active msp/psp when switching stack Torbjörn SVENSSON
2022-11-21 14:04 ` Luis Machado
2022-11-18 15:52 ` Torbjörn SVENSSON [this message]
2022-11-21 14:04 ` [PATCH v2 2/4] gdb/arm: Ensure that stack pointers are in sync Luis Machado
2022-11-18 15:52 ` [PATCH v2 3/4] gdb: dwarf2 generic implementation for caching function data Torbjörn SVENSSON
2022-11-18 16:01 ` Torbjorn SVENSSON
2022-12-20 21:04 ` Tom Tromey
2022-11-21 21:16 ` Luis Machado
2022-11-29 15:19 ` Torbjorn SVENSSON
2022-11-29 16:24 ` Tomas Vanek
2022-11-30 10:16 ` Torbjorn SVENSSON
2022-11-30 10:19 ` Luis Machado
2022-12-08 1:11 ` Luis Machado
2022-12-19 19:28 ` [PING] " Torbjorn SVENSSON
2022-12-20 21:02 ` Tom Tromey
2022-12-28 16:16 ` Torbjorn SVENSSON
2023-01-05 20:53 ` Torbjorn SVENSSON
2023-01-14 6:54 ` Joel Brobecker
2023-01-18 18:47 ` Tom Tromey
2023-01-19 10:31 ` Torbjorn SVENSSON
2022-11-18 15:52 ` [PATCH v2 4/4] gdb/arm: Use new dwarf2 function cache Torbjörn SVENSSON
2022-11-21 21:04 ` Luis Machado
2022-11-29 15:19 ` Torbjorn SVENSSON
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=20221118155252.113476-3-torbjorn.svensson@foss.st.com \
--to=torbjorn.svensson@foss.st.com \
--cc=gdb-patches@sourceware.org \
--cc=luis.machado@arm.com \
--cc=vanekt@volny.cz \
/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).