MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 8 ++++++++ 1 file changed, 8 insertions(+)
Commit e7abb94d1 removed InitializeCpuExceptionHandlersEx
and updated DxeMain to call InitializeCpuExceptionHandlers
for exception setup. But the old behavior that calls *Ex() sets
up the stack guard as well. To match the old behavior,
the patch calls InitializeSeparateExceptionStacks.
Signed-off-by: Ray Ni <ray.ni@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
---
MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 83f49d7c00..0a1f3d79e2 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -256,6 +256,14 @@ DxeMain (
Status = InitializeCpuExceptionHandlers (VectorInfoList);
ASSERT_EFI_ERROR (Status);
+ //
+ // Setup Stack Guard
+ //
+ if (PcdGetBool (PcdCpuStackGuard)) {
+ Status = InitializeSeparateExceptionStacks (NULL);
+ ASSERT_EFI_ERROR (Status);
+ }
+
//
// Initialize Debug Agent to support source level debug in DXE phase
//
--
2.35.1.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90438): https://edk2.groups.io/g/devel/message/90438
Mute This Topic: https://groups.io/mt/91664463/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Jian J Wang <jian.j.wang@intel.com> Regards, Jian > -----Original Message----- > From: Ni, Ray <ray.ni@intel.com> > Sent: Friday, June 10, 2022 4:50 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J <jian.j.wang@intel.com>; Gao, Liming > <gaoliming@byosoft.com.cn> > Subject: [PATCH] DxeMain: Fix the bug that StackGuard is not enabled > > Commit e7abb94d1 removed InitializeCpuExceptionHandlersEx > and updated DxeMain to call InitializeCpuExceptionHandlers > for exception setup. But the old behavior that calls *Ex() sets > up the stack guard as well. To match the old behavior, > the patch calls InitializeSeparateExceptionStacks. > > Signed-off-by: Ray Ni <ray.ni@intel.com> > Cc: Jian J Wang <jian.j.wang@intel.com> > Cc: Liming Gao <gaoliming@byosoft.com.cn> > --- > MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c > b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c > index 83f49d7c00..0a1f3d79e2 100644 > --- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c > +++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c > @@ -256,6 +256,14 @@ DxeMain ( > Status = InitializeCpuExceptionHandlers (VectorInfoList); > > ASSERT_EFI_ERROR (Status); > > > > + // > > + // Setup Stack Guard > > + // > > + if (PcdGetBool (PcdCpuStackGuard)) { > > + Status = InitializeSeparateExceptionStacks (NULL); > > + ASSERT_EFI_ERROR (Status); > > + } > > + > > // > > // Initialize Debug Agent to support source level debug in DXE phase > > // > > -- > 2.35.1.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90456): https://edk2.groups.io/g/devel/message/90456 Mute This Topic: https://groups.io/mt/91664463/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.