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 0762C740038 for ; Fri, 1 Mar 2024 12:18:05 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=BWZrICsrdpicuXWONi18LqFCPjf7H7Z4XvaI8CFRIv8=; 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=1709295484; v=1; b=qnhGcaDzocqRvHy70MqoLs64Hl9b0BtDFpSeihabmGYnJ/hTR0z8pVKD4QlGYF1cmDx1SMop Dm6oix8/CLHOR3moWmBINHXtQWIKwPiregXTOElfI5EVbB9nUbmpXpiJG3prGXOv+Ga/sZ6a7e2 t/NownpncjwBz3LU2+LInIkE= X-Received: by 127.0.0.2 with SMTP id YAkcYY7687511xzmhMqZI9rr; Fri, 01 Mar 2024 04:18:04 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.21296.1709295483699621543 for ; Fri, 01 Mar 2024 04:18:03 -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-207-yPyS7KCyPveH4vc8F2b5EA-1; Fri, 01 Mar 2024 07:17:59 -0500 X-MC-Unique: yPyS7KCyPveH4vc8F2b5EA-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 3C50285A589; Fri, 1 Mar 2024 12:17:59 +0000 (UTC) X-Received: from [10.39.194.215] (unknown [10.39.194.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 748D71C060AF; Fri, 1 Mar 2024 12:17:58 +0000 (UTC) Message-ID: Date: Fri, 1 Mar 2024 13:17:57 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH v3 2/4] MdeModulePkg/SMM: Disallow unregister SMI handler in other SMI handler To: devel@edk2.groups.io, zhiguang.liu@intel.com Cc: Liming Gao , Jiaxin Wu , Ray Ni References: <20240301030133.628-1-zhiguang.liu@intel.com> <20240301030133.628-3-zhiguang.liu@intel.com> From: "Laszlo Ersek" In-Reply-To: <20240301030133.628-3-zhiguang.liu@intel.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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: qntNtSoONna9nd9Z5iyUwAYfx7686176AA= 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=qnhGcaDz; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io On 3/1/24 04:01, Zhiguang Liu wrote: > In last patch, we add code support to unregister SMI handler inside > itself. However, the code doesn't support unregister SMI handler > insider other SMI handler. While this is not a must-have usage. > So add check to disallow unregister SMI handler in other SMI handler. >=20 > Cc: Liming Gao > Cc: Jiaxin Wu > Cc: Ray Ni > Cc: Laszlo Ersek > Signed-off-by: Zhiguang Liu > --- > MdeModulePkg/Core/PiSmmCore/Smi.c | 29 +++++++++++++++++++++-------- > 1 file changed, 21 insertions(+), 8 deletions(-) >=20 > diff --git a/MdeModulePkg/Core/PiSmmCore/Smi.c b/MdeModulePkg/Core/PiSmmC= ore/Smi.c > index 3489c130fd..b3a81ac877 100644 > --- a/MdeModulePkg/Core/PiSmmCore/Smi.c > +++ b/MdeModulePkg/Core/PiSmmCore/Smi.c > @@ -8,7 +8,8 @@ > =20 > #include "PiSmmCore.h" > =20 > -LIST_ENTRY mSmiEntryList =3D INITIALIZE_LIST_HEAD_VARIABLE (mSmiEntryLi= st); > +SMI_HANDLER *mCurrentSmiHandler =3D NULL; > +LIST_ENTRY mSmiEntryList =3D INITIALIZE_LIST_HEAD_VARIABLE (mSmi= EntryList); > =20 > SMI_ENTRY mRootSmiEntry =3D { > SMI_ENTRY_SIGNATURE, > @@ -142,13 +143,18 @@ SmiManage ( > // Link points to may be freed if unregister SMI handler. > // > Link =3D Link->ForwardLink; > - > - Status =3D SmiHandler->Handler ( > - (EFI_HANDLE)SmiHandler, > - Context, > - CommBuffer, > - CommBufferSize > - ); > + // > + // Assign gCurrentSmiHandle before calling the SMI handler and > + // set to NULL when it returns. > + // > + mCurrentSmiHandler =3D SmiHandler; > + Status =3D SmiHandler->Handler ( > + (EFI_HANDLE)SmiHandler, > + Context, > + CommBuffer, > + CommBufferSize > + ); > + mCurrentSmiHandler =3D NULL; > =20 > switch (Status) { > case EFI_INTERRUPT_PENDING: > @@ -328,6 +334,13 @@ SmiHandlerUnRegister ( > return EFI_INVALID_PARAMETER; > } > =20 > + // > + // Do not allow to unregister SMI Handler inside other SMI Handler > + // > + if ((mCurrentSmiHandler !=3D NULL) && (mCurrentSmiHandler !=3D SmiHand= ler)) { > + return EFI_INVALID_PARAMETER; > + } > + > SmiEntry =3D SmiHandler->SmiEntry; > =20 > RemoveEntryList (&SmiHandler->Link); Reviewed-by: Laszlo Ersek -=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 (#116240): https://edk2.groups.io/g/devel/message/116240 Mute This Topic: https://groups.io/mt/104657667/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-