From ae1079b386a597108a8070652bf7cdaa4ec3dda3 Mon Sep 17 00:00:00 2001 From: Zhiguang Liu Date: Fri, 1 Mar 2024 11:01:30 +0800 Subject: MdeModulePkg/SMM: Support to unregister SMI handler inside SMI handler To support unregister SMI handler inside SMI handler itself, get next node before SMI handler is executed, since LIST_ENTRY that Link points to may be freed if unregister SMI handler in SMI handler itself. Cc: Liming Gao Cc: Jiaxin Wu Reviewed-by: Ray Ni Reviewed-by: Laszlo Ersek Signed-off-by: Zhiguang Liu Message-Id: <20240301030133.628-2-zhiguang.liu@intel.com> --- MdeModulePkg/Core/PiSmmCore/Smi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Core/PiSmmCore/Smi.c b/MdeModulePkg/Core/PiSmmCore/Smi.c index 2985f989c3..3489c130fd 100644 --- a/MdeModulePkg/Core/PiSmmCore/Smi.c +++ b/MdeModulePkg/Core/PiSmmCore/Smi.c @@ -134,8 +134,14 @@ SmiManage ( Head = &SmiEntry->SmiHandlers; - for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) { + for (Link = Head->ForwardLink; Link != Head;) { SmiHandler = CR (Link, SMI_HANDLER, Link, SMI_HANDLER_SIGNATURE); + // + // To support unregister SMI handler inside SMI handler itself, + // get next node before handler is executed, since LIST_ENTRY that + // Link points to may be freed if unregister SMI handler. + // + Link = Link->ForwardLink; Status = SmiHandler->Handler ( (EFI_HANDLE)SmiHandler, -- cgit v1.2.3