From nobody Fri Apr 26 22:54:59 2024 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+66284+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+66284+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1602785295738110.35102908975159; Thu, 15 Oct 2020 11:08:15 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id sDkcYY1788612x6ICWB9ePnb; Thu, 15 Oct 2020 11:08:15 -0700 X-Received: from NAM02-BL2-obe.outbound.protection.outlook.com (NAM02-BL2-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web11.16645.1602779580961104462 for ; Thu, 15 Oct 2020 09:33:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVsCVdMymDs8AMfBmP9PyTubxuByRfozWTKZrmJhIFW0Tfu3ixRn691FiXA/ceVesvQjdDtjvnQtzPSPaEOdqERIL3MDNRhIKpo/19Fzr4pjV6+OULAkmTuy1oRNjHllTVcnvrC0RRQmPVJhKlW3dCls6CWRpucO7xgRfCrCq2jLh7gJn8uW684JQiGuGsFnFaDPFq+94VWDmfuWgaQzTuS4pNIixVZh7I75qyG28icsso8GBC3uL4jZd+SHUHe0XHersvVtbH72gHb4DJNeOan/CIn/1ktK6UBrA+S7z7DT2hDEbHG5IAiPrKCbPthisgTRsb+94ocXzbpHZmj1LQ== 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-SenderADCheck; bh=cHv3zjoTmgtYu1Fxn2Qbj9cFaCxCaamJvZvGBQw43vg=; b=VBwAPhtdHEkzZZV63Fnh5dZ6h4LOa6ZAeukjXr8mSNWsGFOVTyqGKPVniPL2lmL9xnHIKhNaoVJfopkRd6qqEEYWWZ01dyZ/MkI3tb5ddK0Uf10efKWmZY7v39Dew5DlUiEJbuLRbogsGJm1iuJupecvT4dMpZXKBRhldYPzqh7LK1ydczT0uPk7Y7AEg+xV/KcYvd723Zo70Pa8/GmXT/AOclimjhUs5PZrZS8UzqYrrJvjyXy9BMHllPn0GHFjA2un0zMJqwCKQ9j7647IMSEOeTTwcwyeujPk71jeJJUx+aaC+9iCMdBFU13+MBBZhemLimjd9LbiGf9QDB8fhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from DM6PR12MB3484.namprd12.prod.outlook.com (2603:10b6:5:3c::15) by DM6PR12MB4974.namprd12.prod.outlook.com (2603:10b6:5:1bb::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Thu, 15 Oct 2020 16:32:59 +0000 X-Received: from DM6PR12MB3484.namprd12.prod.outlook.com ([fe80::448b:c790:cbdd:d479]) by DM6PR12MB3484.namprd12.prod.outlook.com ([fe80::448b:c790:cbdd:d479%3]) with mapi id 15.20.3477.021; Thu, 15 Oct 2020 16:32:59 +0000 From: Mark Wilson To: devel@edk2.groups.io Cc: Mark Wilson , Eric Dong , Ray Ni Subject: [edk2-devel] [PATCH v1 1/1] UefiCpuPkg: Clean up save state boundary checks and comments. Date: Thu, 15 Oct 2020 11:32:43 -0500 Message-Id: <20201015163243.364-2-Mark.Wilson@amd.com> In-Reply-To: <20201015163243.364-1-Mark.Wilson@amd.com> References: <20201015163243.364-1-Mark.Wilson@amd.com> X-Originating-IP: [2605:6000:1023:847e::43a4] X-ClientProxiedBy: DM5PR21CA0046.namprd21.prod.outlook.com (2603:10b6:3:ed::32) To DM6PR12MB3484.namprd12.prod.outlook.com (2603:10b6:5:3c::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from MSDN-MARWILSO.amd.com (2605:6000:1023:847e::43a4) by DM5PR21CA0046.namprd21.prod.outlook.com (2603:10b6:3:ed::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.3 via Frontend Transport; Thu, 15 Oct 2020 16:32:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e9727e4e-3d58-41bd-3dc7-08d87127fa30 X-MS-TrafficTypeDiagnostic: DM6PR12MB4974: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: UzmsrrlZ33boS6vmSJRvL+AqaoXhiKZwmEr0Tg/E1jEqKh9U2wAtIhj64Jdk+SjeDg1CpjJXrnQzGH719FC/JDTaPtS7zRzfVdACeQmv+NuVLB7awRqFDacjdoJyg635QkIfX1jg+eEj1Zg6cTsBbPy2EGGCY6PWbNIRchBQNvKb+GzDvMEci9yqfUopm/hTapMvoWKRV3WMt7ptXxZvNY3oL9dJ0yQawkHIS5SHqKV2fLfisgVTS8RU8cjpOaGosYbd5KoRWuaiI1PrMspWUZU1YEk//ylgCZNeDEQlL6BAdRfL0PZWchYmR3rcqqJVTEZ1HICvhqmfwdvS5U+MfCfO7GpbgFJGDLhkbcFH8vdG0g9dQh7PKdMT+K/f8XS+CcTwLuhrkN6VV1kwvZUVETPUl20aVB+aPlD09Yi9YhxgvyWUUs6KrCDKk0cMPDinLz5ORc6cWNbguV3GvNlVDg== X-MS-Exchange-AntiSpam-MessageData: e0jnpoUfLxZanbJxAgzQ7l5WWVNOx2W7cdCM+3vr5OOPpJfvD70HPvabWiSEUWtMl6mPQ7tAsv24PnuP9MBTyez7jHLbsl76V2mN8ZnBvtHg7GObgm4K/rut2Sq92gm8ODs7AMSAJTbRmlgRkico6L+fvLpkEVi3XzAieRhADuxp68rdkvaOpmrRrcOhr8vGnQj25s3lBWGn+zm+UuFFIAZWwOXSx8WA0ouTtu3EYTtm33/mcyL+RPFivRBdEswlMnKl/EIFuxUJrDNiTkCk7pG5Bwl5WhvBDCIjmaF3Zyzw6jxAxSZTy/aZNpF/5hnvre0cSyhnDjHrL8urAkqXcfgyUhisvXfMKpBlXSs+HXEXw/G1IAqVuhGw7hChnzU1kWXbZpTWlu9qnFN7JkcdmyPgQCC8UP3LQE6WhYocPnpQyCRvM4swnI3lUmeGOqYYPtj0tHG/E2Lqkif/TH2ORCFOQh+tIgJqXS3lCQHlE82m04jbMLOc5g3X1lNl0XLJ+WWUGqNBbhCH/9UEOJGrzIX8zjdCV0nhPFYcKRNZQT8KTAy9XH+fn4nAOPjiBJhTxBnMeaDH7DeFd87rCCye26LptkgeKQ76jGUmLKgbv220dQHM4xdeHejijMs8cGzOf6mYyOaz9DjFoWSx8JKcwx+cub85ZsuGZImnWGYw9hE= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9727e4e-3d58-41bd-3dc7-08d87127fa30 X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3484.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2020 16:32:59.0652 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jAOZ089u0qRcf0vTlxfX+6b3AYT6uJ+1l6YuHK1PvnVyB397hJxJZjX5MYm0X5UT5ZzTQs/kfN3o0FZzMlutJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4974 Precedence: Bulk List-Unsubscribe: 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,Mark.Wilson@amd.com X-Gm-Message-State: q0ztqBgp2HMxXQc8YDHoxFd4x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1602785295; bh=Xuu6zeNG1rDlrHO/lvtgFqULUMtqDNBhp/b8HlsYr28=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=X8TDswapszg5Vdx0LDJelqO8K5PKKXkwuNLonWawFZCaoNILWcqkhsA78pIPYwwY7me RdMxYjPlRDUudLiJKUZ+0eXpADX48IMUuDEw42GkYg+r9AhuFIP9H3G3zBkOu6JMW2c9t Dx8QRVtugNK8MHh8X7HUHZtKoFDBeKeGhxo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2956 In functions ReadSaveStateRegisterByIndex and WriteSaveStateRegister: * check width > 4 instead of >=3D 4 when writing upper 32 bytes. - This improves the code but will not affect functionality. * Update related comments to better describe code. Cc: Eric Dong Cc: Ray Ni Signed-off-by: Mark Wilson --- UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c b/UefiCpuPkg/PiSmmC= puDxeSmm/SmramSaveState.c index 661cc51f361a..4a872e400b7a 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c @@ -297,8 +297,8 @@ ReadSaveStateRegisterByIndex ( // // Write return buffer // - ASSERT(CpuSaveState !=3D NULL); - CopyMem(Buffer, (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterInd= ex].Offset32, Width); + ASSERT (CpuSaveState !=3D NULL); + CopyMem (Buffer, (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIn= dex].Offset32, Width); } else { // // If 64-bit mode width is zero, then the specified register can not b= e accessed @@ -315,14 +315,14 @@ ReadSaveStateRegisterByIndex ( } =20 // - // Write lower 32-bits of return buffer + // Write at most 4 of the lower bytes of the return buffer // - CopyMem(Buffer, (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterInd= ex].Offset64Lo, MIN(4, Width)); - if (Width >=3D 4) { + CopyMem (Buffer, (UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIn= dex].Offset64Lo, MIN(4, Width)); + if (Width > 4) { // - // Write upper 32-bits of return buffer + // Write at most 4 of the upper bytes of the return buffer // - CopyMem((UINT8 *)Buffer + 4, (UINT8 *)CpuSaveState + mSmmCpuWidthOff= set[RegisterIndex].Offset64Hi, Width - 4); + CopyMem ((UINT8 *)Buffer + 4, (UINT8 *)CpuSaveState + mSmmCpuWidthOf= fset[RegisterIndex].Offset64Hi, Width - 4); } } return EFI_SUCCESS; @@ -522,7 +522,7 @@ WriteSaveStateRegister ( // Write SMM State register // ASSERT (CpuSaveState !=3D NULL); - CopyMem((UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Offs= et32, Buffer, Width); + CopyMem ((UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Off= set32, Buffer, Width); } else { // // If 64-bit mode width is zero, then the specified register can not b= e accessed @@ -539,14 +539,14 @@ WriteSaveStateRegister ( } =20 // - // Write lower 32-bits of SMM State register + // Write at most 4 of the lower bytes of SMM State register // - CopyMem((UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Offs= et64Lo, Buffer, MIN (4, Width)); - if (Width >=3D 4) { + CopyMem ((UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Off= set64Lo, Buffer, MIN (4, Width)); + if (Width > 4) { // - // Write upper 32-bits of SMM State register + // Write at most 4 of the upper bytes of SMM State register // - CopyMem((UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].Of= fset64Hi, (UINT8 *)Buffer + 4, Width - 4); + CopyMem ((UINT8 *)CpuSaveState + mSmmCpuWidthOffset[RegisterIndex].O= ffset64Hi, (UINT8 *)Buffer + 4, Width - 4); } } return EFI_SUCCESS; --=20 2.27.0.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 (#66284): https://edk2.groups.io/g/devel/message/66284 Mute This Topic: https://groups.io/mt/77534392/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-