From nobody Mon Sep 16 19:56:10 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+113968+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+113968+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1705531654; cv=none; d=zohomail.com; s=zohoarc; b=LtA4Tc3jpFS8baJdKnefCQLQziZ1nYvJhWMqkwueCHlzk/JgJe06wQ1OUNQEttpwY6i91KcDONx01tSMykNcAbtN8goHUKcN/UhZv+ISgcAESpy9TIFRygX0uvB0l6s8PqWAwNZR4f5HsP+33xZ76XOkioOu1jLUh2ORWejGcDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705531654; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=qA9NTCWAyRwG4/sGH5xRrxi22hZhQTyKrYQdteSu97c=; b=iaD7pWHWLvpqGbH5vFiP/DU2pYnKI2yb5+7YFP/tBMQ6C5qBZJrBtCz0P4CXENh9GSXdz2qoviVZzj9dup31Uc4gVGqgvxGiz5LguiKZzb62ae/UhFufiSJKBFLt2C35BR4UNuZaIvaeymA5CRo9HJjsY45QRT4JigfySUG+cxU= 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+113968+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1705531654939504.1502960323172; Wed, 17 Jan 2024 14:47:34 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=1KpeXNuNgZyfFVyDICpKiYK/MQY0D0xUytskEG+A80M=; 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=1705531654; v=1; b=lWIUMp/sFDQoBmHz/hzkuoh2WavpQTx7LX8ElV0n6cneUpikhBqPwQ4kU10+I7zH8RXel1F1 H70XJAjO65gZowBO2Qc6H/hxFJEtydStAoIK2/dqWhCYLLwvIA4kEUHh1T7XW8qhkNgJyxSrw0X JCNNo7AF4LKq5Etuo50iRLYY= X-Received: by 127.0.0.2 with SMTP id yWUMYY1788612xG5YdWHpjd2; Wed, 17 Jan 2024 14:47:34 -0800 X-Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by mx.groups.io with SMTP id smtpd.web11.1521.1705531653945424199 for ; Wed, 17 Jan 2024 14:47:34 -0800 X-Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-598bcccca79so3398435eaf.2 for ; Wed, 17 Jan 2024 14:47:33 -0800 (PST) X-Gm-Message-State: 6QkUstC1u4LBU9O57QklxVwlx1787277AA= X-Google-Smtp-Source: AGHT+IG/cI17TvU4WqltBnk6vF+LNos925gap2suC7cM9BwJXO84PPBNpz90MELxhY8a0oGG/Yy3eA== X-Received: by 2002:a05:6359:7393:b0:175:a7e5:361d with SMTP id uz19-20020a056359739300b00175a7e5361dmr5251215rwb.36.1705531653037; Wed, 17 Jan 2024 14:47:33 -0800 (PST) X-Received: from localhost.localdomain ([131.107.1.227]) by smtp.gmail.com with ESMTPSA id h10-20020a65518a000000b0059d6f5196fasm139973pgq.78.2024.01.17.14.47.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 14:47:32 -0800 (PST) From: "Doug Flick via groups.io" To: devel@edk2.groups.io Cc: "Douglas Flick [MSFT]" , Jiewen Yao , Rahul Kumar Subject: [edk2-devel] [PATCH 2/3] SecurityPkg: DxeTpmMeasureBootLib: SECURITY PATCH 4117/4118 symbol rename Date: Wed, 17 Jan 2024 14:47:21 -0800 Message-ID: <355aa846a99ca6ac0f7574cf5982661da0d9fea6.1705529990.git.doug.edk2@gmail.com> In-Reply-To: References: 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,dougflick@microsoft.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1705531655657100007 Content-Type: text/plain; charset="utf-8" Updates the sanitation function names to be lib unique names Cc: Jiewen Yao Cc: Rahul Kumar Signed-off-by: Doug Flick [MSFT] --- .../DxeTpmMeasureBootLibSanitization.h | 8 +++--- .../DxeTpmMeasureBootLib.c | 8 +++--- .../DxeTpmMeasureBootLibSanitization.c | 10 +++---- .../DxeTpmMeasureBootLibSanitizationTest.c | 26 +++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLibS= anitization.h b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootL= ibSanitization.h index 2248495813b5..db6e9c3752d6 100644 --- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLibSanitiza= tion.h +++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLibSanitiza= tion.h @@ -53,7 +53,7 @@ **/ EFI_STATUS EFIAPI -SanitizeEfiPartitionTableHeader ( +TpmSanitizeEfiPartitionTableHeader ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, IN CONST EFI_BLOCK_IO_PROTOCOL *BlockIo ); @@ -77,7 +77,7 @@ SanitizeEfiPartitionTableHeader ( **/ EFI_STATUS EFIAPI -SanitizePrimaryHeaderAllocationSize ( +TpmSanitizePrimaryHeaderAllocationSize ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, OUT UINT32 *AllocationSize ); @@ -105,7 +105,7 @@ SanitizePrimaryHeaderAllocationSize ( One of the passed parameters was invalid. **/ EFI_STATUS -SanitizePrimaryHeaderGptEventSize ( +TpmSanitizePrimaryHeaderGptEventSize ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, IN UINTN NumberOfPartition, OUT UINT32 *EventSize @@ -129,7 +129,7 @@ SanitizePrimaryHeaderGptEventSize ( One of the passed parameters was invalid. **/ EFI_STATUS -SanitizePeImageEventSize ( +TpmSanitizePeImageEventSize ( IN UINT32 FilePathSize, OUT UINT32 *EventSize ); diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.= c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c index a9fc440a091e..ac855b8fbbf4 100644 --- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c +++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c @@ -174,7 +174,7 @@ TcgMeasureGptTable ( BlockIo->Media->BlockSize, (UINT8 *)PrimaryHeader ); - if (EFI_ERROR (Status) || EFI_ERROR (SanitizeEfiPartitionTableHeader (Pr= imaryHeader, BlockIo))) { + if (EFI_ERROR (Status) || EFI_ERROR (TpmSanitizeEfiPartitionTableHeader = (PrimaryHeader, BlockIo))) { DEBUG ((DEBUG_ERROR, "Failed to read Partition Table Header or invalid= Partition Table Header!\n")); FreePool (PrimaryHeader); return EFI_DEVICE_ERROR; @@ -183,7 +183,7 @@ TcgMeasureGptTable ( // // Read the partition entry. // - Status =3D SanitizePrimaryHeaderAllocationSize (PrimaryHeader, &AllocSiz= e); + Status =3D TpmSanitizePrimaryHeaderAllocationSize (PrimaryHeader, &Alloc= Size); if (EFI_ERROR (Status)) { FreePool (PrimaryHeader); return EFI_DEVICE_ERROR; @@ -224,7 +224,7 @@ TcgMeasureGptTable ( // // Prepare Data for Measurement // - Status =3D SanitizePrimaryHeaderGptEventSize (PrimaryHeader, NumberOfP= artition, &EventSize); + Status =3D TpmSanitizePrimaryHeaderGptEventSize (PrimaryHeader, Number= OfPartition, &EventSize); TcgEvent =3D (TCG_PCR_EVENT *)AllocateZeroPool (EventSize); if (TcgEvent =3D=3D NULL) { FreePool (PrimaryHeader); @@ -351,7 +351,7 @@ TcgMeasurePeImage ( =20 // Determine destination PCR by BootPolicy // - Status =3D SanitizePeImageEventSize (FilePathSize, &EventSize); + Status =3D TpmSanitizePeImageEventSize (FilePathSize, &EventSize); if (EFI_ERROR (Status)) { return EFI_UNSUPPORTED; } diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLibS= anitization.c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootL= ibSanitization.c index c989851cec2d..070e4a2c1cab 100644 --- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLibSanitiza= tion.c +++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLibSanitiza= tion.c @@ -1,5 +1,5 @@ /** @file - The library instance provides security service of TPM2 measure boot and + The library instance provides security service of TPM measure boot and Confidential Computing (CC) measure boot. =20 Caution: This file requires additional review when modified. @@ -63,7 +63,7 @@ **/ EFI_STATUS EFIAPI -SanitizeEfiPartitionTableHeader ( +TpmSanitizeEfiPartitionTableHeader ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, IN CONST EFI_BLOCK_IO_PROTOCOL *BlockIo ) @@ -145,7 +145,7 @@ SanitizeEfiPartitionTableHeader ( **/ EFI_STATUS EFIAPI -SanitizePrimaryHeaderAllocationSize ( +TpmSanitizePrimaryHeaderAllocationSize ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, OUT UINT32 *AllocationSize ) @@ -194,7 +194,7 @@ SanitizePrimaryHeaderAllocationSize ( One of the passed parameters was invalid. **/ EFI_STATUS -SanitizePrimaryHeaderGptEventSize ( +TpmSanitizePrimaryHeaderGptEventSize ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, IN UINTN NumberOfPartition, OUT UINT32 *EventSize @@ -258,7 +258,7 @@ SanitizePrimaryHeaderGptEventSize ( One of the passed parameters was invalid. **/ EFI_STATUS -SanitizePeImageEventSize ( +TpmSanitizePeImageEventSize ( IN UINT32 FilePathSize, OUT UINT32 *EventSize ) diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/InternalUnitTest/DxeT= pmMeasureBootLibSanitizationTest.c b/SecurityPkg/Library/DxeTpmMeasureBootL= ib/InternalUnitTest/DxeTpmMeasureBootLibSanitizationTest.c index c41498be4521..de1740af41b3 100644 --- a/SecurityPkg/Library/DxeTpmMeasureBootLib/InternalUnitTest/DxeTpmMeasu= reBootLibSanitizationTest.c +++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/InternalUnitTest/DxeTpmMeasu= reBootLibSanitizationTest.c @@ -83,27 +83,27 @@ TestSanitizeEfiPartitionTableHeader ( PrimaryHeader.Header.CRC32 =3D CalculateCrc32 ((UINT8 *)&PrimaryHeader, = PrimaryHeader.Header.HeaderSize); =20 // Test that a normal PrimaryHeader passes validation - Status =3D SanitizeEfiPartitionTableHeader (&PrimaryHeader, &BlockIo); + Status =3D TpmSanitizeEfiPartitionTableHeader (&PrimaryHeader, &BlockIo); UT_ASSERT_NOT_EFI_ERROR (Status); =20 // Test that when number of partition entries is 0, the function returns= EFI_DEVICE_ERROR // Should print "Invalid Partition Table Header NumberOfPartitionEntries= !"" PrimaryHeader.NumberOfPartitionEntries =3D 0; - Status =3D SanitizeEfiPartitionTableHead= er (&PrimaryHeader, &BlockIo); + Status =3D TpmSanitizeEfiPartitionTableH= eader (&PrimaryHeader, &BlockIo); UT_ASSERT_EQUAL (Status, EFI_DEVICE_ERROR); PrimaryHeader.NumberOfPartitionEntries =3D DEFAULT_PRIMARY_TABLE_HEADER_= SIZE_OF_PARTITION_ENTRY; =20 // Test that when the header size is too small, the function returns EFI= _DEVICE_ERROR // Should print "Invalid Partition Table Header Size!" PrimaryHeader.Header.HeaderSize =3D 0; - Status =3D SanitizeEfiPartitionTableHeader (&Pr= imaryHeader, &BlockIo); + Status =3D TpmSanitizeEfiPartitionTableHeader (= &PrimaryHeader, &BlockIo); UT_ASSERT_EQUAL (Status, EFI_DEVICE_ERROR); PrimaryHeader.Header.HeaderSize =3D sizeof (EFI_PARTITION_TABLE_HEADER); =20 // Test that when the SizeOfPartitionEntry is too small, the function re= turns EFI_DEVICE_ERROR // should print: "SizeOfPartitionEntry shall be set to a value of 128 x = 2^n where n is an integer greater than or equal to zero (e.g., 128, 256, 51= 2, etc.)!" PrimaryHeader.SizeOfPartitionEntry =3D 1; - Status =3D SanitizeEfiPartitionTableHeader (= &PrimaryHeader, &BlockIo); + Status =3D TpmSanitizeEfiPartitionTableHeade= r (&PrimaryHeader, &BlockIo); UT_ASSERT_EQUAL (Status, EFI_DEVICE_ERROR); =20 DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__)); @@ -136,7 +136,7 @@ TestSanitizePrimaryHeaderAllocationSize ( PrimaryHeader.NumberOfPartitionEntries =3D 5; PrimaryHeader.SizeOfPartitionEntry =3D DEFAULT_PRIMARY_TABLE_HEADER_= SIZE_OF_PARTITION_ENTRY; =20 - Status =3D SanitizePrimaryHeaderAllocationSize (&PrimaryHeader, &Allocat= ionSize); + Status =3D TpmSanitizePrimaryHeaderAllocationSize (&PrimaryHeader, &Allo= cationSize); UT_ASSERT_NOT_EFI_ERROR (Status); =20 // Test that the allocation size is correct compared to the existing log= ic @@ -145,19 +145,19 @@ TestSanitizePrimaryHeaderAllocationSize ( // Test that an overflow is detected PrimaryHeader.NumberOfPartitionEntries =3D MAX_UINT32; PrimaryHeader.SizeOfPartitionEntry =3D 5; - Status =3D SanitizePrimaryHeaderAllocati= onSize (&PrimaryHeader, &AllocationSize); + Status =3D TpmSanitizePrimaryHeaderAlloc= ationSize (&PrimaryHeader, &AllocationSize); UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE); =20 // Test the inverse PrimaryHeader.NumberOfPartitionEntries =3D 5; PrimaryHeader.SizeOfPartitionEntry =3D MAX_UINT32; - Status =3D SanitizePrimaryHeaderAllocati= onSize (&PrimaryHeader, &AllocationSize); + Status =3D TpmSanitizePrimaryHeaderAlloc= ationSize (&PrimaryHeader, &AllocationSize); UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE); =20 // Test the worst case scenario PrimaryHeader.NumberOfPartitionEntries =3D MAX_UINT32; PrimaryHeader.SizeOfPartitionEntry =3D MAX_UINT32; - Status =3D SanitizePrimaryHeaderAllocati= onSize (&PrimaryHeader, &AllocationSize); + Status =3D TpmSanitizePrimaryHeaderAlloc= ationSize (&PrimaryHeader, &AllocationSize); UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE); =20 DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__)); @@ -195,7 +195,7 @@ TestSanitizePrimaryHeaderGptEventSize ( NumberOfPartition =3D 13; =20 // that the primary event size is correct - Status =3D SanitizePrimaryHeaderGptEventSize (&PrimaryHeader, NumberOfPa= rtition, &EventSize); + Status =3D TpmSanitizePrimaryHeaderGptEventSize (&PrimaryHeader, NumberO= fPartition, &EventSize); UT_ASSERT_NOT_EFI_ERROR (Status); =20 // Calculate the existing logic event size @@ -206,12 +206,12 @@ TestSanitizePrimaryHeaderGptEventSize ( UT_ASSERT_EQUAL (EventSize, ExistingLogicEventSize); =20 // Tests that the primary event size may not overflow - Status =3D SanitizePrimaryHeaderGptEventSize (&PrimaryHeader, MAX_UINT32= , &EventSize); + Status =3D TpmSanitizePrimaryHeaderGptEventSize (&PrimaryHeader, MAX_UIN= T32, &EventSize); UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE); =20 // Test that the size of partition entries may not overflow PrimaryHeader.SizeOfPartitionEntry =3D MAX_UINT32; - Status =3D SanitizePrimaryHeaderGptEventSize= (&PrimaryHeader, NumberOfPartition, &EventSize); + Status =3D TpmSanitizePrimaryHeaderGptEventS= ize (&PrimaryHeader, NumberOfPartition, &EventSize); UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE); =20 DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__)); @@ -269,7 +269,7 @@ TestSanitizePeImageEventSize ( FilePathSize =3D 255; =20 // Test that a normal PE image passes validation - Status =3D SanitizePeImageEventSize (FilePathSize, &EventSize); + Status =3D TpmSanitizePeImageEventSize (FilePathSize, &EventSize); if (EFI_ERROR (Status)) { UT_LOG_ERROR ("SanitizePeImageEventSize failed with %r\n", Status); goto Exit; @@ -285,7 +285,7 @@ TestSanitizePeImageEventSize ( } =20 // Test that the event size may not overflow - Status =3D SanitizePeImageEventSize (MAX_UINT32, &EventSize); + Status =3D TpmSanitizePeImageEventSize (MAX_UINT32, &EventSize); if (Status !=3D EFI_BAD_BUFFER_SIZE) { UT_LOG_ERROR ("SanitizePeImageEventSize succeded when it was supposed = to fail with %r\n", Status); goto Exit; --=20 2.43.0 -=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 (#113968): https://edk2.groups.io/g/devel/message/113968 Mute This Topic: https://groups.io/mt/103797463/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-