From nobody Mon Feb 9 19:53:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+76305+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76305+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623289394; cv=none; d=zohomail.com; s=zohoarc; b=U5/0eShU2NSqHKjxO47owuufE8jWv110j0mIkriRfAh+x/6qabJwpCUhMhDJwn9XrxSSKNn/PASCabgFYw2I+JNQqdZ/FaJSxaGJrkqacJlOlYjk5sFi/6KFRIbsKMQ7fZHkUG/VBvn4ZhcoU0cPFXYxxw5aOmA7hXoSHdZ7gBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623289394; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=s6Sa9sIJ0P5dKml2dMcMV1QBrj+uZW8rYF5R0cPzCMg=; b=hFFChjNes3dkL4l9K7nvFqm1ePkPqiSgSSXqdpe1+mnvCcs4lbhtacM08AvZn50WVdfx0xMNceekz/v8ObwUAwgunpk7QMuWmFUlwT9lnELYefr0+aTfIr9xlqrkQ2hdMlrdAyiGaVt4QPmTyLhLhX8J31lK7gvhlcE752s11L8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76305+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1623289394565722.8890854858286; Wed, 9 Jun 2021 18:43:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SuoQYY1788612xCCk6l7kWfX; Wed, 09 Jun 2021 18:43:14 -0700 X-Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web08.4424.1623289393736188653 for ; Wed, 09 Jun 2021 18:43:13 -0700 X-Received: by mail-pf1-f181.google.com with SMTP id h12so268221pfe.2 for ; Wed, 09 Jun 2021 18:43:13 -0700 (PDT) X-Gm-Message-State: EJ5qG3INJ6eAuP6sEtr7mBAvx1787277AA= X-Google-Smtp-Source: ABdhPJwkRRSruqSs0rlaYmKG/zrBFffmP5ITr7mtqwJoyWfMgSHlrhrxiCDWUUOkOEZrEN3bhxhyiQ== X-Received: by 2002:a63:5a5d:: with SMTP id k29mr2454513pgm.215.1623289393147; Wed, 09 Jun 2021 18:43:13 -0700 (PDT) X-Received: from localhost.localdomain ([50.35.88.161]) by smtp.gmail.com with ESMTPSA id p20sm624990pff.204.2021.06.09.18.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 18:43:12 -0700 (PDT) From: "Kun Qin" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Eric Dong , Ray Ni Subject: [edk2-devel] [PATCH v1 2/5] MdeModulePkg: PiSmmIpl: Update MessageLength calculation for MmCommunicate Date: Wed, 9 Jun 2021 18:42:56 -0700 Message-Id: <20210610014259.1151-3-kuqin12@gmail.com> In-Reply-To: <20210610014259.1151-1-kuqin12@gmail.com> References: <20210610014259.1151-1-kuqin12@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,kuqin12@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1623289394; bh=scGDw9SA0RSqo5OnRwtTRYZ49JaeyliqWtAnDn7QkCw=; h=Cc:Date:From:Reply-To:Subject:To; b=IwC+Mu8Y1sP20zPsmqJN3RaVuv53r2c4KORfx2iF6qa/Khkqzjp27gjI0QiEUbEbOPz WanTMm+uVaxsLeT9HtzwkUXR3A6rv3Kd/IdathvoKLwXNnEM79VaZgbybE5nIU2b82hSH oX/tucgdOiZ08lpWQLAec069BONqVHIXw8M= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3398 This change updated calculation routine for MM communication in PiSmmIpl. It removes ambiguity brought in by UINTN variables from this routine and paves way for updating definition of field MessageLength in EFI_MM_COMMUNICATE_HEADER to definitive size. Cc: Jian J Wang Cc: Hao A Wu Cc: Eric Dong Cc: Ray Ni Signed-off-by: Kun Qin Reviewed-by: Hao A Wu --- MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c | 13 ++++++++++++- MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c b/MdeModulePkg/Core/PiS= mmCore/PiSmmIpl.c index 599a0cd01d80..9508715fda24 100644 --- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c +++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c @@ -34,6 +34,7 @@ #include #include #include +#include // BZ3398 =20 #include "PiSmmCorePrivateData.h" =20 @@ -515,6 +516,7 @@ SmmCommunicationCommunicate ( EFI_STATUS Status; EFI_SMM_COMMUNICATE_HEADER *CommunicateHeader; BOOLEAN OldInSmm; + UINT64 BZ3398_LongCommSize; UINTN TempCommSize; =20 // @@ -527,7 +529,16 @@ SmmCommunicationCommunicate ( CommunicateHeader =3D (EFI_SMM_COMMUNICATE_HEADER *) CommBuffer; =20 if (CommSize =3D=3D NULL) { - TempCommSize =3D OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data) + Commun= icateHeader->MessageLength; + // BZ3398 Starts: Make MessageLength the same size in EFI_MM_COMMUNICA= TE_HEADER for both IA32 and X64. + Status =3D SafeUint64Add (OFFSET_OF (EFI_SMM_COMMUNICATE_HEADER, Data)= , CommunicateHeader->MessageLength, &BZ3398_LongCommSize); + if (EFI_ERROR (Status)) { + return EFI_INVALID_PARAMETER; + } + Status =3D SafeUint64ToUintn (BZ3398_LongCommSize, &TempCommSize); + if (EFI_ERROR (Status)) { + return EFI_INVALID_PARAMETER; + } + // BZ3398 Ends } else { TempCommSize =3D *CommSize; // diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf b/MdeModulePkg/Core/P= iSmmCore/PiSmmIpl.inf index 6109d6b5449c..87142e27fa47 100644 --- a/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf +++ b/MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf @@ -46,6 +46,7 @@ [LibraryClasses] DxeServicesLib PcdLib ReportStatusCodeLib + SafeIntLib #BZ3398 =20 [Protocols] gEfiSmmBase2ProtocolGuid ## PRODUCES --=20 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 (#76305): https://edk2.groups.io/g/devel/message/76305 Mute This Topic: https://groups.io/mt/83435923/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-