Merged Mike
From: Kinney, Michael D <michael.d.kin...@intel.com> Sent: Wednesday, December 6, 2023 8:47 AM To: Jake Garver <j...@nvidia.com>; Gao, Liming <gaolim...@byosoft.com.cn>; devel@edk2.groups.io Cc: Liu, Zhiguang <zhiguang....@intel.com>; Kinney, Michael D <michael.d.kin...@intel.com> Subject: RE: [PATCH v2] BaseStackCheckLib: Fix STACK FAULT message Hi Jake, PR opened with Rb tag added: https://github.com/tianocore/edk2/pull/5113 Mike From: Jake Garver <j...@nvidia.com<mailto:j...@nvidia.com>> Sent: Wednesday, December 6, 2023 8:37 AM To: Gao, Liming <gaolim...@byosoft.com.cn<mailto:gaolim...@byosoft.com.cn>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> Cc: Kinney, Michael D <michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com>>; Liu, Zhiguang <zhiguang....@intel.com<mailto:zhiguang....@intel.com>> Subject: Re: [PATCH v2] BaseStackCheckLib: Fix STACK FAULT message Any further comments on this change? I'd like to get it merged. Thanks, Jake ________________________________ From: Jake Garver <j...@nvidia.com<mailto:j...@nvidia.com>> Sent: Wednesday, October 18, 2023 10:45 AM To: gaoliming <gaolim...@byosoft.com.cn<mailto:gaolim...@byosoft.com.cn>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> Cc: michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com> <michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com>>; zhiguang....@intel.com<mailto:zhiguang....@intel.com> <zhiguang....@intel.com<mailto:zhiguang....@intel.com>> Subject: Re: [PATCH v2] BaseStackCheckLib: Fix STACK FAULT message Thanks for the review, Liming Gao. Any further comments on this change? Thanks, Jake ________________________________ From: gaoliming <gaolim...@byosoft.com.cn<mailto:gaolim...@byosoft.com.cn>> Sent: Saturday, October 7, 2023 1:05 AM To: Jake Garver <j...@nvidia.com<mailto:j...@nvidia.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> Cc: michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com> <michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com>>; zhiguang....@intel.com<mailto:zhiguang....@intel.com> <zhiguang....@intel.com<mailto:zhiguang....@intel.com>> Subject: 回复: [PATCH v2] BaseStackCheckLib: Fix STACK FAULT message External email: Use caution opening links or attachments Reviewed-by: Liming Gao <gaolim...@byosoft.com.cn<mailto:gaolim...@byosoft.com.cn>> > -----邮件原件----- > 发件人: Jake Garver <j...@nvidia.com<mailto:j...@nvidia.com>> > 发送时间: 2023年10月6日 0:19 > 收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io> > 抄送: michael.d.kin...@intel.com<mailto:michael.d.kin...@intel.com>; > gaolim...@byosoft.com.cn<mailto:gaolim...@byosoft.com.cn>; > zhiguang....@intel.com<mailto:zhiguang....@intel.com>; Jake Garver > <j...@nvidia.com<mailto:j...@nvidia.com>> > 主题: [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 <j...@nvidia.com<mailto:j...@nvidia.com>> > --- > 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.<BR> > 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 (#112134): https://edk2.groups.io/g/devel/message/112134 Mute This Topic: https://groups.io/mt/102040342/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
