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 3C035740038 for ; Fri, 1 Mar 2024 03:08:28 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=45dtdC87ChcXv7A63dK0M6JSkzedOJNnomfxkY6v9tE=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version: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=1709262506; v=1; b=GrkJf+Si4bv6r4fTHW1HYo37pQeXWnL1pxnGC1XLb7de0NfhwztlmmLOnmtfFENvKp+qheBt K0ejbwSuEIj6DqWz4oxIAmNw//c8azaSv00MwzZpNmiaufqbtuymfspHt6aYSIUC8hKJKdAS6/l InIcAPpzWLJdkCQeCVvH7wQo= X-Received: by 127.0.0.2 with SMTP id PIa2YY7687511xvlJMa5iBpr; Thu, 29 Feb 2024 19:08:26 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by mx.groups.io with SMTP id smtpd.web10.14150.1709262506334130934 for ; Thu, 29 Feb 2024 19:08:26 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10999"; a="3955766" X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="3955766" X-Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Feb 2024 19:08:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,194,1705392000"; d="scan'208";a="12651537" X-Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmviesa004.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 29 Feb 2024 19:08:25 -0800 X-Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 29 Feb 2024 19:08:25 -0800 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 29 Feb 2024 19:08:24 -0800 X-Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Thu, 29 Feb 2024 19:08:24 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 29 Feb 2024 19:08:24 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lnGzY/13+Xaz4mEA5RNYzKSE5eTsArxu9a94lH6TvEZsHs+1dFMiRVsgnyKqUV0+5nFjGDEMb8QCiiMRYFCn15jsLR2QAMWpGEk8u1IhaXu4jNu/j6LwK2TV5jQyXLT0amrYSQOXgREP8gCVfNSfdN05bQQ2FzywUPazIM5QH5GQauDlsIw2H0RcVXzGIFjVDlIxlYrOEgam/5VSVvqosd0oOjCJI8UEXmpxg4EGZM/ZLLQR4eOSIEENtPomP3GTi3NeeZGnEumLWfHrax7/Jw7oqnmmrTLE9GhQ9OVxKHMRTXmKn4vc/xq/AAAB8n4kmfcVJPIZ6FJClsaBKCvU5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SukOgxqW8sGm6EDfJB7HRCxtHER1oW7jNPAVM8vzs+w=; b=Ym7P7RrtOGfXYGEl20NoaMjFJx+XjLzkZMNWBIj72TXGORnhyRgyN6WlUa5oilq7zTuSRhknTv9KdAdSiWvcANyBTIbrlG4wg8KP4Elak0NSXRLf7xlYo0K+MzPaR9ijrFEK6rHuNOS1OswwSXngf5mRDFOLolTCqxzEfG3Qy5wgcLQJg4WASFmf9VOC6AENKu1xxNTUpx/u2hUfngPYNtAKV0XXRYFnqwNHrte+jduMt7PMIvP0G592iGPqjIGYNUC0hxuL133XTc6pkleRMaTf59YEbglFxpehBZhc9qTPLYAkNlAje92fiIyJ55l8mJYPSJJIlg5iu1GtiqSIHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by CY8PR11MB7171.namprd11.prod.outlook.com (2603:10b6:930:92::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.25; Fri, 1 Mar 2024 03:08:17 +0000 X-Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::2c31:82b7:9f26:5817]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::2c31:82b7:9f26:5817%5]) with mapi id 15.20.7362.013; Fri, 1 Mar 2024 03:08:17 +0000 From: "Ni, Ray" To: "Liu, Zhiguang" , "devel@edk2.groups.io" CC: Liming Gao , "Wu, Jiaxin" , Laszlo Ersek Subject: Re: [edk2-devel] [PATCH v3 2/4] MdeModulePkg/SMM: Disallow unregister SMI handler in other SMI handler Thread-Topic: [PATCH v3 2/4] MdeModulePkg/SMM: Disallow unregister SMI handler in other SMI handler Thread-Index: AQHaa4Vg5v3/tQPuzEWtze6+60IVz7EiNBig Date: Fri, 1 Mar 2024 03:08:17 +0000 Message-ID: References: <20240301030133.628-1-zhiguang.liu@intel.com> <20240301030133.628-3-zhiguang.liu@intel.com> In-Reply-To: <20240301030133.628-3-zhiguang.liu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN6PR11MB8244:EE_|CY8PR11MB7171:EE_ x-ms-office365-filtering-correlation-id: c2579626-39ce-4334-d691-08dc399cd795 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: 9nNfyvoEBh3j2VXU0kRHPdkQ7ZdSiuTPpA0DRBO2HtOTqKXHQIjzTSnbBf8msuYdJF92gVD3ll+Ffu7fecZVoL/h2y2O7rRlpMovH8N6cZlKOAQ8lrRZyoZVnYjQ94y/npk+NXjWKUaV9OTVpMjl9QY470fvKkyBRUy2WKhzCDVlLjMprRy9S2EPyjA8GBoMUyFzVp8ExRxKgZp7IpSeBlcbQrhElYHhPaTPeUq+bIOk5ULhlu5Uqmuqo0XbnePrPL8eSwrHwbEvbeiT3MwRBVfB+5r6GmnM4Uv76+y9ipVp9OcSnw4vLo+IK8eGzN6kmm84ZSn11B2K5z4VTIttEC62kGPCXCJGidfMoKnqVbik+eIVsdeVGP6QDLipkY4NeMX9gEPxbZfPE9/HI00Pek2xjo5lNCH/eW2xr1HPtnoJKYjDmnFvFRlcyXAYgOcdVOWhJXb2zIFDZirKoLYWPYKCOu4zjnVdmOE4R7C416iN3rmATyibbIGcmGQ7delHzdn/61MUtgc66GZQsnOuIFSZzasknzPENA/FPfrrcTKelTmGd7URBYiw3PoeXoduXrKLAneGfe0n3Hni1fQc7SOiEVx6a//U98LNM9i1s4UM4qxlpxs6Rgck0KO83WRoYMPKCt4oVO4XBSP49Zf/dKvQqzNYunZTH458kzS5+4XxNBbqfUvfvJkXNweqSKT7xt4RqfmDTLi4s5cA+jvhEskh3O+wodDmKBdSyS83zUk= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?x7HbH6pdYFK1+ujK6yom1e5T7FbaH8ecJ/QLw7GpH6xDCPkEs32LIo6L264Z?= =?us-ascii?Q?khnZsSMr+YxmKn84oA1yZwhHdbtg0Mryu7v5bgDyac2lcfZdq0yRowTthzFz?= =?us-ascii?Q?OrOOuR3VvaouLnBllvOoQqupNbQkBTEegtzLvTKiV6hCNTuEl4I8hq6jwqT4?= =?us-ascii?Q?bJgXCl6JKQPPrJajDoopz8xea1NjBnIGWJxfCbX2Z3VRy1FMLskoRghm/tre?= =?us-ascii?Q?KQQ6eaJNMhyG1cyIKkom5g9YwCOvs78sNTEEtVG+WhtdzKfueQsOhQ4ecmj+?= =?us-ascii?Q?bzJY9OC+QvgnNuHCv8zZsS22lfZQZjwzfzI4v8VbLUucERjlUOnpR0YqG7Pj?= =?us-ascii?Q?I5gMzOFKZfwnPDXEbfKZzFK4tAuJkmE8qb/eaw52Oc+M7YFi/iFb0A0TY2P4?= =?us-ascii?Q?e7RYcmWrwSfizvoQ8wxfyHoMD10Mk0MPOY5Le9WiRJwEZNCi8mysKXYneYrY?= =?us-ascii?Q?uxP1rlm8YFgtcbRjKcnY4ZeEZ8Y9AnSAodT0MA7hsjbLKbYer8UvhXec2Q3K?= =?us-ascii?Q?RdBuCjVSXMAwOEsNhvY4sBAt7R5vYzIyexxMCe7cRL0/kVnNOSybj5IMyrwM?= =?us-ascii?Q?5hXQlYBnyOvgyLF7NWzcEJVxRk4CfCDqzS6x1+bipZLP+kQhBPT2feCkiLdx?= =?us-ascii?Q?sbDQoFnqJxMiQcZau2cw527ly8I66lsRVFx61GR+p70umR4FidcHPFtfYpIE?= =?us-ascii?Q?NZH7oRJjiJ83oisTIbYfdoUyY20jgCqvu8THiWG+Qw6KuYlz7FGDJI85XuTC?= =?us-ascii?Q?OXxqFmcISyPXV013PquehobvaiMAZRvWa6PW136DlKYnjshxHNwp1RLawXfJ?= =?us-ascii?Q?Ty64bIMWI9ln8JpWOtUFGCgkwuZigJalsEszW7jxg0r85q6Y5Mm6+JGmqEox?= =?us-ascii?Q?5FzoCgwsvjX5jzg11qJhOhCwvjwa5l5py/4B+qEwXNs0gLWQlJmLw0cfgSWt?= =?us-ascii?Q?x0WCEH98bSIxuKBCblV4yVw4lxzzhGtnOgtFqjT86JutXoLOs4Xs4r5OwAWT?= =?us-ascii?Q?X4Kqw0LiPX2cAwFTKIKoVJyzXRyGWpQhl6/bN0qnQPz+2zv+toi1BVTfjDEx?= =?us-ascii?Q?GIIxgd3P87d/OU0IAgczaUSs94qkBcj85dYxRyw6mwIp4c4yRH+g3THKRS/G?= =?us-ascii?Q?GOsxnWBp2WdQZwooUDijpZcMnuihizDMW1J61UqicQXVvRxlL2JyFMcbC4ld?= =?us-ascii?Q?/5JnkyMEk98D/M5P43RHwXbTP0BZZgD8vSYJByBgj0+n2YC8iLZO8LqblNUD?= =?us-ascii?Q?yWthq1KUHsC4KYMlt4poR+5PTzMxGqTXt62/MBRRZFUuVWweoyNDTK9coUCR?= =?us-ascii?Q?SCdbp3w5NUZtUdiUiPe9NReBtjcagPAcDSq2d5NVYrFOSBjGdcH9C+Nn2XqP?= =?us-ascii?Q?05G/gz4iOKOggxE+Sxz5RuGy/MQ74SdZN140CLy93O7IFnE+601sluJq669c?= =?us-ascii?Q?i3QD04jnTP9k3pqB5W736SMMhUBAeWQuZhBqINOyJPbZGo/Cf/9rNFIW3wFn?= =?us-ascii?Q?MkaLI776KECHISWhmsfFLyfuP0Rw09O6hWq00J6OmXetDTU0vwqp6Djzk1FY?= =?us-ascii?Q?zGTK2bSnBmPLG1bs8Dw=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2579626-39ce-4334-d691-08dc399cd795 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2024 03:08:17.3916 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: jefn9c4WAP6Gi1oDH1jWbBVB4270Rd7SqVbZ3GElP95vTutjrjoC9DhW179SQOkUrvNmAhs7IH+S3gPzEejcxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR11MB7171 X-OriginatorOrg: intel.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,ray.ni@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ODJCxxu5qxutSgzW3FXEgfeKx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" 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=GrkJf+Si; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.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; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Reviewed-by: Ray Ni Thanks, Ray > -----Original Message----- > From: Liu, Zhiguang > Sent: Friday, March 1, 2024 11:02 AM > To: devel@edk2.groups.io > Cc: Liu, Zhiguang ; Liming Gao > ; Wu, Jiaxin ; Ni, Ray > ; Laszlo Ersek > Subject: [PATCH v3 2/4] MdeModulePkg/SMM: Disallow unregister SMI > handler in other SMI handler >=20 > 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/PiSmmCore/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 > (mSmiEntryList); > +SMI_HANDLER *mCurrentSmiHandler =3D NULL; > +LIST_ENTRY mSmiEntryList =3D INITIALIZE_LIST_HEAD_VARIABLE > (mSmiEntryList); >=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 > SmiHandler)) { > + return EFI_INVALID_PARAMETER; > + } > + > SmiEntry =3D SmiHandler->SmiEntry; >=20 > RemoveEntryList (&SmiHandler->Link); > -- > 2.31.1.windows.1 -=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 (#116208): https://edk2.groups.io/g/devel/message/116208 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-