MdePkg/Library/BaseStackCheckLib/BaseStackCheckGcc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
__builtin_return_address returns a pointer, not a string. Fix the STACK
FAULT message in BaseStackCheckLib appropriately.
Signed-off-by: Jake Garver <jake@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 (#109359): https://edk2.groups.io/g/devel/message/109359
Mute This Topic: https://groups.io/mt/101779895/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> -----邮件原件-----
> 发件人: Jake Garver <jake@nvidia.com>
> 发送时间: 2023年10月6日 0:19
> 收件人: devel@edk2.groups.io
> 抄送: michael.d.kinney@intel.com; gaoliming@byosoft.com.cn;
> zhiguang.liu@intel.com; Jake Garver <jake@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 <jake@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 (#109378): https://edk2.groups.io/g/devel/message/109378
Mute This Topic: https://groups.io/mt/101812329/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Thanks for the review, Liming Gao.
Any further comments on this change?
Thanks,
Jake
________________________________
From: gaoliming <gaoliming@byosoft.com.cn>
Sent: Saturday, October 7, 2023 1:05 AM
To: Jake Garver <jake@nvidia.com>; devel@edk2.groups.io <devel@edk2.groups.io>
Cc: michael.d.kinney@intel.com <michael.d.kinney@intel.com>; zhiguang.liu@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 <gaoliming@byosoft.com.cn>
> -----邮件原件-----
> 发件人: Jake Garver <jake@nvidia.com>
> 发送时间: 2023年10月6日 0:19
> 收件人: devel@edk2.groups.io
> 抄送: michael.d.kinney@intel.com; gaoliming@byosoft.com.cn;
> zhiguang.liu@intel.com; Jake Garver <jake@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 <jake@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 (#109756): https://edk2.groups.io/g/devel/message/109756
Mute This Topic: https://groups.io/mt/102040342/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Any further comments on this change?
I'd like to get it merged.
Thanks,
Jake
________________________________
From: Jake Garver <jake@nvidia.com>
Sent: Wednesday, October 18, 2023 10:45 AM
To: gaoliming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io <devel@edk2.groups.io>
Cc: michael.d.kinney@intel.com <michael.d.kinney@intel.com>; zhiguang.liu@intel.com <zhiguang.liu@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 <gaoliming@byosoft.com.cn>
Sent: Saturday, October 7, 2023 1:05 AM
To: Jake Garver <jake@nvidia.com>; devel@edk2.groups.io <devel@edk2.groups.io>
Cc: michael.d.kinney@intel.com <michael.d.kinney@intel.com>; zhiguang.liu@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 <gaoliming@byosoft.com.cn>
> -----邮件原件-----
> 发件人: Jake Garver <jake@nvidia.com>
> 发送时间: 2023年10月6日 0:19
> 收件人: devel@edk2.groups.io
> 抄送: michael.d.kinney@intel.com; gaoliming@byosoft.com.cn;
> zhiguang.liu@intel.com; Jake Garver <jake@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 <jake@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 (#112131): https://edk2.groups.io/g/devel/message/112131
Mute This Topic: https://groups.io/mt/102040342/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Jake,
PR opened with Rb tag added: https://github.com/tianocore/edk2/pull/5113
Mike
From: Jake Garver <jake@nvidia.com>
Sent: Wednesday, December 6, 2023 8:37 AM
To: Gao, Liming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io
Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Liu, Zhiguang <zhiguang.liu@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 <jake@nvidia.com<mailto:jake@nvidia.com>>
Sent: Wednesday, October 18, 2023 10:45 AM
To: gaoliming <gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>
Cc: michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com> <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>; zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com> <zhiguang.liu@intel.com<mailto:zhiguang.liu@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 <gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>>
Sent: Saturday, October 7, 2023 1:05 AM
To: Jake Garver <jake@nvidia.com<mailto:jake@nvidia.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>
Cc: michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com> <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>; zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com> <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>
Subject: 回复: [PATCH v2] BaseStackCheckLib: Fix STACK FAULT message
External email: Use caution opening links or attachments
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>>
> -----邮件原件-----
> 发件人: Jake Garver <jake@nvidia.com<mailto:jake@nvidia.com>>
> 发送时间: 2023年10月6日 0:19
> 收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
> 抄送: michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>; gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>;
> zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>; Jake Garver <jake@nvidia.com<mailto:jake@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 <jake@nvidia.com<mailto:jake@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 (#112132): https://edk2.groups.io/g/devel/message/112132
Mute This Topic: https://groups.io/mt/102040342/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Merged
Mike
From: Kinney, Michael D <michael.d.kinney@intel.com>
Sent: Wednesday, December 6, 2023 8:47 AM
To: Jake Garver <jake@nvidia.com>; Gao, Liming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io
Cc: Liu, Zhiguang <zhiguang.liu@intel.com>; Kinney, Michael D <michael.d.kinney@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 <jake@nvidia.com<mailto:jake@nvidia.com>>
Sent: Wednesday, December 6, 2023 8:37 AM
To: Gao, Liming <gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>
Cc: Kinney, Michael D <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>; Liu, Zhiguang <zhiguang.liu@intel.com<mailto:zhiguang.liu@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 <jake@nvidia.com<mailto:jake@nvidia.com>>
Sent: Wednesday, October 18, 2023 10:45 AM
To: gaoliming <gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>
Cc: michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com> <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>; zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com> <zhiguang.liu@intel.com<mailto:zhiguang.liu@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 <gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>>
Sent: Saturday, October 7, 2023 1:05 AM
To: Jake Garver <jake@nvidia.com<mailto:jake@nvidia.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>
Cc: michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com> <michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>>; zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com> <zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>>
Subject: 回复: [PATCH v2] BaseStackCheckLib: Fix STACK FAULT message
External email: Use caution opening links or attachments
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>>
> -----邮件原件-----
> 发件人: Jake Garver <jake@nvidia.com<mailto:jake@nvidia.com>>
> 发送时间: 2023年10月6日 0:19
> 收件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io>
> 抄送: michael.d.kinney@intel.com<mailto:michael.d.kinney@intel.com>; gaoliming@byosoft.com.cn<mailto:gaoliming@byosoft.com.cn>;
> zhiguang.liu@intel.com<mailto:zhiguang.liu@intel.com>; Jake Garver <jake@nvidia.com<mailto:jake@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 <jake@nvidia.com<mailto:jake@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/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2026 Red Hat, Inc.