From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id CDE55D80CA2 for ; Wed, 28 Feb 2024 08:47:39 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=aS8HhxNISEQQZ0insaZXST31B0yBEZzZSftBk4EALaE=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1709110058; v=1; b=QPHAU4piitbH6AXLEgaKxiMSyNkmCuNe47VIabq2ZjJw5QKU7NqeYqkcSW9vd2kNCRXSN9OZ Udsq1fV2zJzua6QISeMo+ZA21ufhH8vC35zDlt+F/iO/xUqNCTiSmuHcuikjXZlKzKdS2zDUh0K 3j1dOUl1HUWy4FDqjIMKJbYE= X-Received: by 127.0.0.2 with SMTP id gL4JYY7687511xR6hpkUzX0i; Wed, 28 Feb 2024 00:47:38 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.9176.1709110057943688604 for ; Wed, 28 Feb 2024 00:47:38 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-318-LzQBEgiOP8WYLiwuQyKo9w-1; Wed, 28 Feb 2024 03:47:33 -0500 X-MC-Unique: LzQBEgiOP8WYLiwuQyKo9w-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0EE02881F01; Wed, 28 Feb 2024 08:47:33 +0000 (UTC) X-Received: from [10.39.193.212] (unknown [10.39.193.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0B86F408A42E; Wed, 28 Feb 2024 08:47:31 +0000 (UTC) Message-ID: Date: Wed, 28 Feb 2024 09:47:31 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH v2 4/4] StandaloneMmPkg: Disallow unregister MMI handler in other MMI handler To: devel@edk2.groups.io, zhiguang.liu@intel.com Cc: Liming Gao , Jiaxin Wu , Ray Ni , Ard Biesheuvel , Sami Mujawar References: <20240228022750.873-1-zhiguang.liu@intel.com> <20240228022750.873-5-zhiguang.liu@intel.com> From: "Laszlo Ersek" In-Reply-To: <20240228022750.873-5-zhiguang.liu@intel.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: KQys8sZzY5QbhLq01ojXrqnIx7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=QPHAU4pi; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none) On 2/28/24 03:27, Zhiguang Liu wrote: > 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. >=20 > Cc: Liming Gao > Cc: Jiaxin Wu > Cc: Ray Ni > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Cc: Sami Mujawar > Cc: Ray Ni > Signed-off-by: Zhiguang Liu > --- > StandaloneMmPkg/Core/Mmi.c | 35 ++++++++++++++++++++++++++--------- > 1 file changed, 26 insertions(+), 9 deletions(-) >=20 > diff --git a/StandaloneMmPkg/Core/Mmi.c b/StandaloneMmPkg/Core/Mmi.c > index c1a1d76e85..54794c6b3d 100644 > --- a/StandaloneMmPkg/Core/Mmi.c > +++ b/StandaloneMmPkg/Core/Mmi.c > @@ -36,8 +36,9 @@ typedef struct { > MMI_ENTRY *MmiEntry; > } MMI_HANDLER; > =20 > -LIST_ENTRY mRootMmiHandlerList =3D INITIALIZE_LIST_HEAD_VARIABLE (mRoot= MmiHandlerList); > -LIST_ENTRY mMmiEntryList =3D INITIALIZE_LIST_HEAD_VARIABLE (mMmiE= ntryList); > +LIST_ENTRY mRootMmiHandlerList =3D INITIALIZE_LIST_HEAD_VARIABLE (mRoo= tMmiHandlerList); > +LIST_ENTRY mMmiEntryList =3D INITIALIZE_LIST_HEAD_VARIABLE (mMmi= EntryList); > +MMI_HANDLER *gCurrentMmiHandler =3D NULL; > =20 > /** > 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 =3D Link->ForwardLink; > - Status =3D MmiHandler->Handler ( > - (EFI_HANDLE)MmiHandler, > - Context, > - CommBuffer, > - CommBufferSize > - ); > + Link =3D Link->ForwardLink; > + // > + // Assign gCurrentMmiHandle before calling the MMI handler and > + // set to NULL when it returns. > + // > + gCurrentMmiHandler =3D MmiHandler; > + Status =3D MmiHandler->Handler ( > + (EFI_HANDLE)MmiHandler, > + Context, > + CommBuffer, > + CommBufferSize > + ); > + gCurrentMmiHandler =3D NULL; > =20 > switch (Status) { > case EFI_INTERRUPT_PENDING: > @@ -314,6 +321,16 @@ MmiHandlerUnRegister ( > return EFI_INVALID_PARAMETER; > } > =20 > + // > + // Check if unregister MMI handler inside a MMI Handler > + // > + if (gCurrentMmiHandler !=3D NULL) { > + // > + // Only allow to unregister MMI Handler inside itself. > + // > + ASSERT (gCurrentMmiHandler =3D=3D MmiHandler); > + } > + > MmiEntry =3D MmiHandler->MmiEntry; > =20 > RemoveEntryList (&MmiHandler->Link); same comment as for patch#2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116103): https://edk2.groups.io/g/devel/message/116103 Mute This Topic: https://groups.io/mt/104616995/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-