Thanks for the review, Liming Gao. Any further comments on this change? Thanks, Jake ________________________________ From: gaoliming Sent: Saturday, October 7, 2023 1:05 AM To: Jake Garver ; devel@edk2.groups.io Cc: michael.d.kinney@intel.com ; zhiguang.liu@intel.com Subject: 回复: [PATCH v2] BaseStackCheckLib: Fix STACK FAULT message External email: Use caution opening links or attachments Reviewed-by: Liming Gao > -----邮件原件----- > 发件人: Jake Garver > 发送时间: 2023年10月6日 0:19 > 收件人: devel@edk2.groups.io > 抄送: michael.d.kinney@intel.com; gaoliming@byosoft.com.cn; > zhiguang.liu@intel.com; Jake Garver > 主题: [PATCH v2] BaseStackCheckLib: Fix STACK FAULT message > > __builtin_return_address returns a pointer, not a string. Fix the STACK > FAULT message in BaseStackCheckLib appropriately. > > Signed-off-by: Jake Garver > --- > MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c > b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c > index 0d2918668e..ea168841b6 100644 > --- a/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c > +++ b/MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c > @@ -6,6 +6,7 @@ > to exiting the function. If the "canary" is overwritten __stack_chk_fail() > is called. This is GCC specific code. > > + Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. > Copyright (c) 2012, Apple Inc. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent > > @@ -34,7 +35,7 @@ __stack_chk_fail ( > { > UINT8 DebugPropertyMask; > > - DEBUG ((DEBUG_ERROR, "STACK FAULT: Buffer Overflow in > function %a.\n", __builtin_return_address (0))); > + DEBUG ((DEBUG_ERROR, "STACK FAULT: Buffer Overflow at 0x%p.\n", > RETURN_ADDRESS (0))); > > // > // Generate a Breakpoint, DeadLoop, or NOP based on PCD settings even > if > -- > 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109756): https://edk2.groups.io/g/devel/message/109756 Mute This Topic: https://groups.io/mt/102040342/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-