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 5A631D80689 for ; Wed, 28 Feb 2024 02:28:25 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=ItCwF+91mGF8KHaqYeY499yr9z+PO6hY+bp0IrhCPQA=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1709087304; v=1; b=sOllnbCf4davBuozH3XaeWRzAWJlZ7GuKBSlneF/rbQLirSwVbx7+LhFLtgzqodUrzdQOCoS 0Swy5i7trfYTL+j6C67dgoT2fST8JB9TZWYzdUPvAiuoZlYG1t5EEFEyA72KaMejtCapmjmTgUp zxnwACN5xpwXdWdSVbhPD9D4= X-Received: by 127.0.0.2 with SMTP id l1rtYY7687511xmd54oOBOb4; Tue, 27 Feb 2024 18:28:24 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by mx.groups.io with SMTP id smtpd.web11.4428.1709087295523770648 for ; Tue, 27 Feb 2024 18:28:23 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10996"; a="7285810" X-IronPort-AV: E=Sophos;i="6.06,189,1705392000"; d="scan'208";a="7285810" X-Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2024 18:28:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,189,1705392000"; d="scan'208";a="11893895" X-Received: from shwdesfp01.ccr.corp.intel.com ([10.239.158.151]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Feb 2024 18:28:21 -0800 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Zhiguang Liu , Liming Gao , Jiaxin Wu , Ray Ni , Laszlo Ersek , Ard Biesheuvel , Sami Mujawar Subject: [edk2-devel] [PATCH v2 4/4] StandaloneMmPkg: Disallow unregister MMI handler in other MMI handler Date: Wed, 28 Feb 2024 10:27:50 +0800 Message-Id: <20240228022750.873-5-zhiguang.liu@intel.com> In-Reply-To: <20240228022750.873-1-zhiguang.liu@intel.com> References: <20240228022750.873-1-zhiguang.liu@intel.com> MIME-Version: 1.0 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,zhiguang.liu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: gqcVJBQBp2ipz7FBuyqXiwcsx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=sOllnbCf; 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=intel.com (policy=none) 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 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(-) 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; -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 *gCurrentMmiHandler = 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. + // + gCurrentMmiHandler = MmiHandler; + Status = MmiHandler->Handler ( + (EFI_HANDLE)MmiHandler, + Context, + CommBuffer, + CommBufferSize + ); + gCurrentMmiHandler = NULL; switch (Status) { case EFI_INTERRUPT_PENDING: @@ -314,6 +321,16 @@ MmiHandlerUnRegister ( return EFI_INVALID_PARAMETER; } + // + // Check if unregister MMI handler inside a MMI Handler + // + if (gCurrentMmiHandler != NULL) { + // + // Only allow to unregister MMI Handler inside itself. + // + ASSERT (gCurrentMmiHandler == MmiHandler); + } + 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 (#116075): https://edk2.groups.io/g/devel/message/116075 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] -=-=-=-=-=-=-=-=-=-=-=-