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 1D1C0D811A4 for ; Wed, 17 Jan 2024 22:47:35 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=393UYSps8FwYYCrZ0kQW3JkTGVYhIAMVobhwExa1aDA=; 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=uQ+Xs8FzNRvHKPLqGoSFiiMlAwzxPie4nG43SoySSKxIGcKL/aWiySSXWq9oD/Ad2MoAREAJ m0b1VbVBUO+79PR+gnv+fCwbh4pJE5FHE+IuDnZ3kXsfIcru9KtiJaoQvM9o1WFu+kFjyrqWjm/ IvbiuBhID6Tb5gXyc4c9vkX0= X-Received: by 127.0.0.2 with SMTP id uw2TYY7687511x2RfUTs3nmi; 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: khYYhnPClMKu1oneJWdHCvtCx7686176AA= 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-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=uQ+Xs8Fz; 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=none 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 @@ **/=0D EFI_STATUS=0D EFIAPI=0D -SanitizeEfiPartitionTableHeader (=0D +TpmSanitizeEfiPartitionTableHeader (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D IN CONST EFI_BLOCK_IO_PROTOCOL *BlockIo=0D );=0D @@ -77,7 +77,7 @@ SanitizeEfiPartitionTableHeader ( **/=0D EFI_STATUS=0D EFIAPI=0D -SanitizePrimaryHeaderAllocationSize (=0D +TpmSanitizePrimaryHeaderAllocationSize (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D OUT UINT32 *AllocationSize=0D );=0D @@ -105,7 +105,7 @@ SanitizePrimaryHeaderAllocationSize ( One of the passed parameters was invalid.=0D **/=0D EFI_STATUS=0D -SanitizePrimaryHeaderGptEventSize (=0D +TpmSanitizePrimaryHeaderGptEventSize (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D IN UINTN NumberOfPartition,=0D OUT UINT32 *EventSize=0D @@ -129,7 +129,7 @@ SanitizePrimaryHeaderGptEventSize ( One of the passed parameters was invalid.=0D **/=0D EFI_STATUS=0D -SanitizePeImageEventSize (=0D +TpmSanitizePeImageEventSize (=0D IN UINT32 FilePathSize,=0D OUT UINT32 *EventSize=0D );=0D 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,=0D (UINT8 *)PrimaryHeader=0D );=0D - if (EFI_ERROR (Status) || EFI_ERROR (SanitizeEfiPartitionTableHeader (Pr= imaryHeader, BlockIo))) {=0D + if (EFI_ERROR (Status) || EFI_ERROR (TpmSanitizeEfiPartitionTableHeader = (PrimaryHeader, BlockIo))) {=0D DEBUG ((DEBUG_ERROR, "Failed to read Partition Table Header or invalid= Partition Table Header!\n"));=0D FreePool (PrimaryHeader);=0D return EFI_DEVICE_ERROR;=0D @@ -183,7 +183,7 @@ TcgMeasureGptTable ( //=0D // Read the partition entry.=0D //=0D - Status =3D SanitizePrimaryHeaderAllocationSize (PrimaryHeader, &AllocSiz= e);=0D + Status =3D TpmSanitizePrimaryHeaderAllocationSize (PrimaryHeader, &Alloc= Size);=0D if (EFI_ERROR (Status)) {=0D FreePool (PrimaryHeader);=0D return EFI_DEVICE_ERROR;=0D @@ -224,7 +224,7 @@ TcgMeasureGptTable ( //=0D // Prepare Data for Measurement=0D //=0D - Status =3D SanitizePrimaryHeaderGptEventSize (PrimaryHeader, NumberOfP= artition, &EventSize);=0D + Status =3D TpmSanitizePrimaryHeaderGptEventSize (PrimaryHeader, Number= OfPartition, &EventSize);=0D TcgEvent =3D (TCG_PCR_EVENT *)AllocateZeroPool (EventSize);=0D if (TcgEvent =3D=3D NULL) {=0D FreePool (PrimaryHeader);=0D @@ -351,7 +351,7 @@ TcgMeasurePeImage ( =0D // Determine destination PCR by BootPolicy=0D //=0D - Status =3D SanitizePeImageEventSize (FilePathSize, &EventSize);=0D + Status =3D TpmSanitizePeImageEventSize (FilePathSize, &EventSize);=0D if (EFI_ERROR (Status)) {=0D return EFI_UNSUPPORTED;=0D }=0D 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=0D - The library instance provides security service of TPM2 measure boot and= =0D + The library instance provides security service of TPM measure boot and=0D Confidential Computing (CC) measure boot.=0D =0D Caution: This file requires additional review when modified.=0D @@ -63,7 +63,7 @@ **/=0D EFI_STATUS=0D EFIAPI=0D -SanitizeEfiPartitionTableHeader (=0D +TpmSanitizeEfiPartitionTableHeader (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D IN CONST EFI_BLOCK_IO_PROTOCOL *BlockIo=0D )=0D @@ -145,7 +145,7 @@ SanitizeEfiPartitionTableHeader ( **/=0D EFI_STATUS=0D EFIAPI=0D -SanitizePrimaryHeaderAllocationSize (=0D +TpmSanitizePrimaryHeaderAllocationSize (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D OUT UINT32 *AllocationSize=0D )=0D @@ -194,7 +194,7 @@ SanitizePrimaryHeaderAllocationSize ( One of the passed parameters was invalid.=0D **/=0D EFI_STATUS=0D -SanitizePrimaryHeaderGptEventSize (=0D +TpmSanitizePrimaryHeaderGptEventSize (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D IN UINTN NumberOfPartition,=0D OUT UINT32 *EventSize=0D @@ -258,7 +258,7 @@ SanitizePrimaryHeaderGptEventSize ( One of the passed parameters was invalid.=0D **/=0D EFI_STATUS=0D -SanitizePeImageEventSize (=0D +TpmSanitizePeImageEventSize (=0D IN UINT32 FilePathSize,=0D OUT UINT32 *EventSize=0D )=0D 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);=0D =0D // Test that a normal PrimaryHeader passes validation=0D - Status =3D SanitizeEfiPartitionTableHeader (&PrimaryHeader, &BlockIo);=0D + Status =3D TpmSanitizeEfiPartitionTableHeader (&PrimaryHeader, &BlockIo)= ;=0D UT_ASSERT_NOT_EFI_ERROR (Status);=0D =0D // Test that when number of partition entries is 0, the function returns= EFI_DEVICE_ERROR=0D // Should print "Invalid Partition Table Header NumberOfPartitionEntries= !""=0D PrimaryHeader.NumberOfPartitionEntries =3D 0;=0D - Status =3D SanitizeEfiPartitionTableHead= er (&PrimaryHeader, &BlockIo);=0D + Status =3D TpmSanitizeEfiPartitionTableH= eader (&PrimaryHeader, &BlockIo);=0D UT_ASSERT_EQUAL (Status, EFI_DEVICE_ERROR);=0D PrimaryHeader.NumberOfPartitionEntries =3D DEFAULT_PRIMARY_TABLE_HEADER_= SIZE_OF_PARTITION_ENTRY;=0D =0D // Test that when the header size is too small, the function returns EFI= _DEVICE_ERROR=0D // Should print "Invalid Partition Table Header Size!"=0D PrimaryHeader.Header.HeaderSize =3D 0;=0D - Status =3D SanitizeEfiPartitionTableHeader (&Pr= imaryHeader, &BlockIo);=0D + Status =3D TpmSanitizeEfiPartitionTableHeader (= &PrimaryHeader, &BlockIo);=0D UT_ASSERT_EQUAL (Status, EFI_DEVICE_ERROR);=0D PrimaryHeader.Header.HeaderSize =3D sizeof (EFI_PARTITION_TABLE_HEADER);= =0D =0D // Test that when the SizeOfPartitionEntry is too small, the function re= turns EFI_DEVICE_ERROR=0D // 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.)!"=0D PrimaryHeader.SizeOfPartitionEntry =3D 1;=0D - Status =3D SanitizeEfiPartitionTableHeader (= &PrimaryHeader, &BlockIo);=0D + Status =3D TpmSanitizeEfiPartitionTableHeade= r (&PrimaryHeader, &BlockIo);=0D UT_ASSERT_EQUAL (Status, EFI_DEVICE_ERROR);=0D =0D DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__));=0D @@ -136,7 +136,7 @@ TestSanitizePrimaryHeaderAllocationSize ( PrimaryHeader.NumberOfPartitionEntries =3D 5;=0D PrimaryHeader.SizeOfPartitionEntry =3D DEFAULT_PRIMARY_TABLE_HEADER_= SIZE_OF_PARTITION_ENTRY;=0D =0D - Status =3D SanitizePrimaryHeaderAllocationSize (&PrimaryHeader, &Allocat= ionSize);=0D + Status =3D TpmSanitizePrimaryHeaderAllocationSize (&PrimaryHeader, &Allo= cationSize);=0D UT_ASSERT_NOT_EFI_ERROR (Status);=0D =0D // Test that the allocation size is correct compared to the existing log= ic=0D @@ -145,19 +145,19 @@ TestSanitizePrimaryHeaderAllocationSize ( // Test that an overflow is detected=0D PrimaryHeader.NumberOfPartitionEntries =3D MAX_UINT32;=0D PrimaryHeader.SizeOfPartitionEntry =3D 5;=0D - Status =3D SanitizePrimaryHeaderAllocati= onSize (&PrimaryHeader, &AllocationSize);=0D + Status =3D TpmSanitizePrimaryHeaderAlloc= ationSize (&PrimaryHeader, &AllocationSize);=0D UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE);=0D =0D // Test the inverse=0D PrimaryHeader.NumberOfPartitionEntries =3D 5;=0D PrimaryHeader.SizeOfPartitionEntry =3D MAX_UINT32;=0D - Status =3D SanitizePrimaryHeaderAllocati= onSize (&PrimaryHeader, &AllocationSize);=0D + Status =3D TpmSanitizePrimaryHeaderAlloc= ationSize (&PrimaryHeader, &AllocationSize);=0D UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE);=0D =0D // Test the worst case scenario=0D PrimaryHeader.NumberOfPartitionEntries =3D MAX_UINT32;=0D PrimaryHeader.SizeOfPartitionEntry =3D MAX_UINT32;=0D - Status =3D SanitizePrimaryHeaderAllocati= onSize (&PrimaryHeader, &AllocationSize);=0D + Status =3D TpmSanitizePrimaryHeaderAlloc= ationSize (&PrimaryHeader, &AllocationSize);=0D UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE);=0D =0D DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__));=0D @@ -195,7 +195,7 @@ TestSanitizePrimaryHeaderGptEventSize ( NumberOfPartition =3D 13;=0D =0D // that the primary event size is correct=0D - Status =3D SanitizePrimaryHeaderGptEventSize (&PrimaryHeader, NumberOfPa= rtition, &EventSize);=0D + Status =3D TpmSanitizePrimaryHeaderGptEventSize (&PrimaryHeader, NumberO= fPartition, &EventSize);=0D UT_ASSERT_NOT_EFI_ERROR (Status);=0D =0D // Calculate the existing logic event size=0D @@ -206,12 +206,12 @@ TestSanitizePrimaryHeaderGptEventSize ( UT_ASSERT_EQUAL (EventSize, ExistingLogicEventSize);=0D =0D // Tests that the primary event size may not overflow=0D - Status =3D SanitizePrimaryHeaderGptEventSize (&PrimaryHeader, MAX_UINT32= , &EventSize);=0D + Status =3D TpmSanitizePrimaryHeaderGptEventSize (&PrimaryHeader, MAX_UIN= T32, &EventSize);=0D UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE);=0D =0D // Test that the size of partition entries may not overflow=0D PrimaryHeader.SizeOfPartitionEntry =3D MAX_UINT32;=0D - Status =3D SanitizePrimaryHeaderGptEventSize= (&PrimaryHeader, NumberOfPartition, &EventSize);=0D + Status =3D TpmSanitizePrimaryHeaderGptEventS= ize (&PrimaryHeader, NumberOfPartition, &EventSize);=0D UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE);=0D =0D DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__));=0D @@ -269,7 +269,7 @@ TestSanitizePeImageEventSize ( FilePathSize =3D 255;=0D =0D // Test that a normal PE image passes validation=0D - Status =3D SanitizePeImageEventSize (FilePathSize, &EventSize);=0D + Status =3D TpmSanitizePeImageEventSize (FilePathSize, &EventSize);=0D if (EFI_ERROR (Status)) {=0D UT_LOG_ERROR ("SanitizePeImageEventSize failed with %r\n", Status);=0D goto Exit;=0D @@ -285,7 +285,7 @@ TestSanitizePeImageEventSize ( }=0D =0D // Test that the event size may not overflow=0D - Status =3D SanitizePeImageEventSize (MAX_UINT32, &EventSize);=0D + Status =3D TpmSanitizePeImageEventSize (MAX_UINT32, &EventSize);=0D if (Status !=3D EFI_BAD_BUFFER_SIZE) {=0D UT_LOG_ERROR ("SanitizePeImageEventSize succeded when it was supposed = to fail with %r\n", Status);=0D goto Exit;=0D --=20 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- 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/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-