From: "Jan Bobek" <jbobek@nvidia.com>
To: <devel@edk2.groups.io>
Cc: Harry Liebel <Harry.Liebel@arm.com>,
Olivier Martin <olivier.martin@arm.com>,
Liming Gao <liming.gao@intel.com>,
Jeff Brasen <jbrasen@nvidia.com>,
Ashish Singhal <ashishsingha@nvidia.com>
Subject: [PATCH 1/1] MdePkg/BaseLib: Fix invalid memory access in AArch64 SetJump/LongJump
Date: Mon, 28 Sep 2020 19:12:58 -0600 [thread overview]
Message-ID: <bc7a5e050dc8b24be8e9189e18e4f4a88b089d78.1601327092.git.jbobek@nvidia.com> (raw)
In-Reply-To: <cover.1601327092.git.jbobek@nvidia.com>
Correct the memory offsets used in REG_ONE/REG_PAIR macros to
synchronize them with definition of the BASE_LIBRARY_JUMP_BUFFER
structure on AArch64.
The REG_ONE macro declares only a single 64-bit register be
read/written; however, the subsequent offset has previously been 16
bytes larger, creating an unused memory gap in the middle of the
structure and causing SetJump/LongJump functions to read/write 8 bytes
of memory past the end of the jump buffer struct.
Signed-off-by: Jan Bobek <jbobek@nvidia.com>
---
MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S | 8 ++++----
MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
index 72cea259e9..deefdf526b 100644
--- a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
+++ b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.S
@@ -20,10 +20,10 @@ GCC_ASM_EXPORT(InternalLongJump)
REG_ONE (x16, 96) /*IP0*/
#define FPR_LAYOUT \
- REG_PAIR ( d8, d9, 112); \
- REG_PAIR (d10, d11, 128); \
- REG_PAIR (d12, d13, 144); \
- REG_PAIR (d14, d15, 160);
+ REG_PAIR ( d8, d9, 104); \
+ REG_PAIR (d10, d11, 120); \
+ REG_PAIR (d12, d13, 136); \
+ REG_PAIR (d14, d15, 152);
#/**
# Saves the current CPU context that can be restored with a call to LongJump() and returns 0.#
diff --git a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
index 20dd0f1b85..df70f29899 100644
--- a/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
+++ b/MdePkg/Library/BaseLib/AArch64/SetJumpLongJump.asm
@@ -19,10 +19,10 @@
REG_ONE (x16, #96) /*IP0*/
#define FPR_LAYOUT \
- REG_PAIR ( d8, d9, #112); \
- REG_PAIR (d10, d11, #128); \
- REG_PAIR (d12, d13, #144); \
- REG_PAIR (d14, d15, #160);
+ REG_PAIR ( d8, d9, #104); \
+ REG_PAIR (d10, d11, #120); \
+ REG_PAIR (d12, d13, #136); \
+ REG_PAIR (d14, d15, #152);
;/**
; Saves the current CPU context that can be restored with a call to LongJump() and returns 0.#
--
2.28.0
next prev parent reply other threads:[~2020-09-29 1:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 1:12 [PATCH 0/1] MdePkg/BaseLib: AArch64 SetJump/LongJump bugfix jbobek
2020-09-29 1:12 ` Jan Bobek [this message]
2020-10-01 13:04 ` [edk2-devel] [PATCH 1/1] MdePkg/BaseLib: Fix invalid memory access in AArch64 SetJump/LongJump Laszlo Ersek
2020-10-01 13:17 ` Ard Biesheuvel
2020-10-01 15:39 ` Jan Bobek
2020-10-01 13:02 ` [edk2-devel] [PATCH 0/1] MdePkg/BaseLib: AArch64 SetJump/LongJump bugfix Laszlo Ersek
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-list 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=bc7a5e050dc8b24be8e9189e18e4f4a88b089d78.1601327092.git.jbobek@nvidia.com \
--to=devel@edk2.groups.io \
/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