From: "Ni, Ray" <ray.ni@intel.com>
To: "Liu, Zhiguang" <zhiguang.liu@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: Liming Gao <gaoliming@byosoft.com.cn>,
"Wu, Jiaxin" <jiaxin.wu@intel.com>,
Laszlo Ersek <lersek@redhat.com>,
Ard Biesheuvel <ardb+tianocore@kernel.org>,
Sami Mujawar <sami.mujawar@arm.com>
Subject: Re: [edk2-devel] [PATCH v3 4/4] StandaloneMmPkg: Disallow unregister MMI handler in other MMI handler
Date: Fri, 1 Mar 2024 03:08:22 +0000 [thread overview]
Message-ID: <MN6PR11MB8244E59AE1191914B545AA308C5E2@MN6PR11MB8244.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20240301030133.628-5-zhiguang.liu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Thanks,
Ray
> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu@intel.com>
> Sent: Friday, March 1, 2024 11:02 AM
> To: devel@edk2.groups.io
> Cc: Liu, Zhiguang <zhiguang.liu@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Wu, Jiaxin <jiaxin.wu@intel.com>; Ni, Ray
> <ray.ni@intel.com>; Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Sami Mujawar <sami.mujawar@arm.com>
> Subject: [PATCH v3 4/4] StandaloneMmPkg: Disallow unregister MMI handler
> in other MMI handler
>
> In last patch, we add code support to unregister MMI handler inside
> itself. However, the code doesn't support unregister MMI handler
> insider other MMI handler. While this is not a must-have usage.
> So add check to disallow unregister MMI handler in other MMI handler.
>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
> StandaloneMmPkg/Core/Mmi.c | 32 +++++++++++++++++++++++---------
> 1 file changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/StandaloneMmPkg/Core/Mmi.c b/StandaloneMmPkg/Core/Mmi.c
> index c1a1d76e85..9e52072bf7 100644
> --- a/StandaloneMmPkg/Core/Mmi.c
> +++ b/StandaloneMmPkg/Core/Mmi.c
> @@ -36,8 +36,9 @@ typedef struct {
> MMI_ENTRY *MmiEntry;
> } MMI_HANDLER;
>
> -LIST_ENTRY mRootMmiHandlerList = INITIALIZE_LIST_HEAD_VARIABLE
> (mRootMmiHandlerList);
> -LIST_ENTRY mMmiEntryList = INITIALIZE_LIST_HEAD_VARIABLE
> (mMmiEntryList);
> +LIST_ENTRY mRootMmiHandlerList = INITIALIZE_LIST_HEAD_VARIABLE
> (mRootMmiHandlerList);
> +LIST_ENTRY mMmiEntryList = INITIALIZE_LIST_HEAD_VARIABLE
> (mMmiEntryList);
> +MMI_HANDLER *mCurrentMmiHandler = NULL;
>
> /**
> Finds the MMI entry for the requested handler type.
> @@ -161,13 +162,19 @@ MmiManage (
> // get next node before handler is executed, since LIST_ENTRY that
> // Link points to may be freed if unregister MMI handler.
> //
> - Link = Link->ForwardLink;
> - Status = MmiHandler->Handler (
> - (EFI_HANDLE)MmiHandler,
> - Context,
> - CommBuffer,
> - CommBufferSize
> - );
> + Link = Link->ForwardLink;
> + //
> + // Assign gCurrentMmiHandle before calling the MMI handler and
> + // set to NULL when it returns.
> + //
> + mCurrentMmiHandler = MmiHandler;
> + Status = MmiHandler->Handler (
> + (EFI_HANDLE)MmiHandler,
> + Context,
> + CommBuffer,
> + CommBufferSize
> + );
> + mCurrentMmiHandler = NULL;
>
> switch (Status) {
> case EFI_INTERRUPT_PENDING:
> @@ -314,6 +321,13 @@ MmiHandlerUnRegister (
> return EFI_INVALID_PARAMETER;
> }
>
> + //
> + // Do not allow to unregister MMI Handler inside other MMI Handler
> + //
> + if ((mCurrentMmiHandler != NULL) && (mCurrentMmiHandler !=
> MmiHandler)) {
> + return EFI_INVALID_PARAMETER;
> + }
> +
> MmiEntry = MmiHandler->MmiEntry;
>
> RemoveEntryList (&MmiHandler->Link);
> --
> 2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116209): https://edk2.groups.io/g/devel/message/116209
Mute This Topic: https://groups.io/mt/104657669/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2024-03-01 3:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 3:01 [edk2-devel] [PATCH v3 0/4] Support to unregister SMI handler inside SMI handler Zhiguang Liu
2024-03-01 3:01 ` [edk2-devel] [PATCH v3 1/4] MdeModulePkg/SMM: " Zhiguang Liu
2024-03-01 3:01 ` [edk2-devel] [PATCH v3 2/4] MdeModulePkg/SMM: Disallow unregister SMI handler in other " Zhiguang Liu
2024-03-01 3:08 ` Ni, Ray
2024-03-01 12:17 ` Laszlo Ersek
2024-03-01 3:01 ` [edk2-devel] [PATCH v3 3/4] StandaloneMmPkg: Support to unregister MMI handler inside MMI handler Zhiguang Liu
2024-03-01 3:01 ` [edk2-devel] [PATCH v3 4/4] StandaloneMmPkg: Disallow unregister MMI handler in other " Zhiguang Liu
2024-03-01 3:08 ` Ni, Ray [this message]
2024-03-01 12:18 ` Laszlo Ersek
2024-03-01 18:58 ` [edk2-devel] [PATCH v3 0/4] Support to unregister SMI handler inside SMI handler Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MN6PR11MB8244E59AE1191914B545AA308C5E2@MN6PR11MB8244.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox