From nobody Fri Oct 18 09:21:18 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+113967+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+113967+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1705531654; cv=none; d=zohomail.com; s=zohoarc; b=Xqx2Ne2DKTFiskVs9q45+b+4Ac3doNwS7lFNsY2ePLzbJX0FszFt2jHFkNvhMSTsgIST/7oVpjlC5nFM1RM6Fa3Riw3AnA8tyw31/C8wGFIaULIHl+QN9ViVJ3Yv6Mg3VZAhQ4PcPZiVtLV3fbBh7FERZlmYEdYU322RFFx74+8= 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=6HG9ueE9RB4Q8WaBTtwNfzq05CNOM1vqDI2vombLaEk=; b=KSmk5Vtv9LsOYdqwvTP5qBi+jxJJY4xLY4dXLp0/RCvRh0/YuIZzffBUxRr0XEqGNpjrtGZ7tvq0mGEf9Lm9LOouQn6QTKjjdv5fzDc8M/Zzf1IBgIwB3GF0eQsgIQUInBsxpAL3gJ9jUer7K9IuQkYbosq4C2/YZVU5nm98khE= 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+113967+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 170553165423491.66779415622796; Wed, 17 Jan 2024 14:47:34 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=UraK5nwMWhp9TXp+f5nrXdSWxd6PKcmcdNO270f0O7s=; 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=1705531653; v=1; b=RIN+uD0rCogZ1sRlwuEZGq5KLo2zZBxpd361cg+ax5V2x/EhPZHFPf5QFYTfutXjOelEqsgA 1GxgLwVIjpJCmX12ai7981daUaBcdk7I0aqfJfANteVm5hNcFl1mPrCcOD6BDJPl9yCe++EHXu9 BnjXqG7snlc21t27r4Cyogsg= X-Received: by 127.0.0.2 with SMTP id 6Lt2YY1788612xNdK7qEUjaZ; Wed, 17 Jan 2024 14:47:33 -0800 X-Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by mx.groups.io with SMTP id smtpd.web10.1546.1705531653257745874 for ; Wed, 17 Jan 2024 14:47:33 -0800 X-Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6ddee0aa208so5554744a34.3 for ; Wed, 17 Jan 2024 14:47:33 -0800 (PST) X-Gm-Message-State: bU4cpOyePI133ag2rgxYImlax1787277AA= X-Google-Smtp-Source: AGHT+IGC96gSyzq1VVcmghG1Kym6QEf7il8x4CbKxDXao4TkkcHQDKmeGKFw6PdQZxWtrvTQDKK+lg== X-Received: by 2002:a05:6358:429c:b0:175:93ed:b8e6 with SMTP id s28-20020a056358429c00b0017593edb8e6mr12538718rwc.52.1705531652285; Wed, 17 Jan 2024 14:47:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 14:47:31 -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 1/3] SecurityPkg: DxeTpm2MeasureBootLib: SECURITY PATCH 4117/4118 symbol rename Date: Wed, 17 Jan 2024 14:47:20 -0800 Message-ID: <7b18434c8a8b561654efd40ced3becb8b378c8f1.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: 1705531655566100003 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] --- .../DxeTpm2MeasureBootLibSanitization.h | 8 +++--- .../DxeTpm2MeasureBootLib.c | 8 +++--- .../DxeTpm2MeasureBootLibSanitization.c | 8 +++--- .../DxeTpm2MeasureBootLibSanitizationTest.c | 26 +++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLi= bSanitization.h b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureB= ootLibSanitization.h index 8f72ba42401f..8526bc7537d5 100644 --- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLibSaniti= zation.h +++ b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLibSaniti= zation.h @@ -54,7 +54,7 @@ **/ EFI_STATUS EFIAPI -SanitizeEfiPartitionTableHeader ( +Tpm2SanitizeEfiPartitionTableHeader ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, IN CONST EFI_BLOCK_IO_PROTOCOL *BlockIo ); @@ -78,7 +78,7 @@ SanitizeEfiPartitionTableHeader ( **/ EFI_STATUS EFIAPI -SanitizePrimaryHeaderAllocationSize ( +Tpm2SanitizePrimaryHeaderAllocationSize ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, OUT UINT32 *AllocationSize ); @@ -107,7 +107,7 @@ SanitizePrimaryHeaderAllocationSize ( One of the passed parameters was invalid. **/ EFI_STATUS -SanitizePrimaryHeaderGptEventSize ( +Tpm2SanitizePrimaryHeaderGptEventSize ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, IN UINTN NumberOfPartition, OUT UINT32 *EventSize @@ -131,7 +131,7 @@ SanitizePrimaryHeaderGptEventSize ( One of the passed parameters was invalid. **/ EFI_STATUS -SanitizePeImageEventSize ( +Tpm2SanitizePeImageEventSize ( IN UINT32 FilePathSize, OUT UINT32 *EventSize ); diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLi= b.c b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c index 714cc8e03e80..73719f3b96ed 100644 --- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c +++ b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.c @@ -200,7 +200,7 @@ Tcg2MeasureGptTable ( BlockIo->Media->BlockSize, (UINT8 *)PrimaryHeader ); - if (EFI_ERROR (Status) || EFI_ERROR (SanitizeEfiPartitionTableHeader (Pr= imaryHeader, BlockIo))) { + if (EFI_ERROR (Status) || EFI_ERROR (Tpm2SanitizeEfiPartitionTableHeader= (PrimaryHeader, BlockIo))) { DEBUG ((DEBUG_ERROR, "Failed to read Partition Table Header or invalid= Partition Table Header!\n")); FreePool (PrimaryHeader); return EFI_DEVICE_ERROR; @@ -209,7 +209,7 @@ Tcg2MeasureGptTable ( // // Read the partition entry. // - Status =3D SanitizePrimaryHeaderAllocationSize (PrimaryHeader, &AllocSiz= e); + Status =3D Tpm2SanitizePrimaryHeaderAllocationSize (PrimaryHeader, &Allo= cSize); if (EFI_ERROR (Status)) { FreePool (PrimaryHeader); return EFI_BAD_BUFFER_SIZE; @@ -250,7 +250,7 @@ Tcg2MeasureGptTable ( // // Prepare Data for Measurement (CcProtocol and Tcg2Protocol) // - Status =3D SanitizePrimaryHeaderGptEventSize (PrimaryHeader, NumberOfPar= tition, &TcgEventSize); + Status =3D Tpm2SanitizePrimaryHeaderGptEventSize (PrimaryHeader, NumberO= fPartition, &TcgEventSize); if (EFI_ERROR (Status)) { FreePool (PrimaryHeader); FreePool (EntryPtr); @@ -420,7 +420,7 @@ Tcg2MeasurePeImage ( } =20 FilePathSize =3D (UINT32)GetDevicePathSize (FilePath); - Status =3D SanitizePeImageEventSize (FilePathSize, &EventSize); + Status =3D Tpm2SanitizePeImageEventSize (FilePathSize, &EventSize); if (EFI_ERROR (Status)) { return EFI_UNSUPPORTED; } diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLi= bSanitization.c b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureB= ootLibSanitization.c index 2a4d52c6d5cf..809a3bfd892e 100644 --- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLibSaniti= zation.c +++ b/SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLibSaniti= zation.c @@ -63,7 +63,7 @@ **/ EFI_STATUS EFIAPI -SanitizeEfiPartitionTableHeader ( +Tpm2SanitizeEfiPartitionTableHeader ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, IN CONST EFI_BLOCK_IO_PROTOCOL *BlockIo ) @@ -169,7 +169,7 @@ SanitizeEfiPartitionTableHeader ( **/ EFI_STATUS EFIAPI -SanitizePrimaryHeaderAllocationSize ( +Tpm2SanitizePrimaryHeaderAllocationSize ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, OUT UINT32 *AllocationSize ) @@ -221,7 +221,7 @@ SanitizePrimaryHeaderAllocationSize ( One of the passed parameters was invalid. **/ EFI_STATUS -SanitizePrimaryHeaderGptEventSize ( +Tpm2SanitizePrimaryHeaderGptEventSize ( IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader, IN UINTN NumberOfPartition, OUT UINT32 *EventSize @@ -292,7 +292,7 @@ SanitizePrimaryHeaderGptEventSize ( One of the passed parameters was invalid. **/ EFI_STATUS -SanitizePeImageEventSize ( +Tpm2SanitizePeImageEventSize ( IN UINT32 FilePathSize, OUT UINT32 *EventSize ) diff --git a/SecurityPkg/Library/DxeTpm2MeasureBootLib/InternalUnitTest/Dxe= Tpm2MeasureBootLibSanitizationTest.c b/SecurityPkg/Library/DxeTpm2MeasureBo= otLib/InternalUnitTest/DxeTpm2MeasureBootLibSanitizationTest.c index 820e99aeb9b4..50a68e1076ad 100644 --- a/SecurityPkg/Library/DxeTpm2MeasureBootLib/InternalUnitTest/DxeTpm2Mea= sureBootLibSanitizationTest.c +++ b/SecurityPkg/Library/DxeTpm2MeasureBootLib/InternalUnitTest/DxeTpm2Mea= sureBootLibSanitizationTest.c @@ -84,27 +84,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 Tpm2SanitizeEfiPartitionTableHeader (&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 Tpm2SanitizeEfiPartitionTable= Header (&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 Tpm2SanitizeEfiPartitionTableHeader = (&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 Tpm2SanitizeEfiPartitionTableHead= er (&PrimaryHeader, &BlockIo); UT_ASSERT_EQUAL (Status, EFI_DEVICE_ERROR); =20 DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__)); @@ -137,7 +137,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 Tpm2SanitizePrimaryHeaderAllocationSize (&PrimaryHeader, &All= ocationSize); UT_ASSERT_NOT_EFI_ERROR (Status); =20 // Test that the allocation size is correct compared to the existing log= ic @@ -146,19 +146,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 Tpm2SanitizePrimaryHeaderAllo= cationSize (&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 Tpm2SanitizePrimaryHeaderAllo= cationSize (&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 Tpm2SanitizePrimaryHeaderAllo= cationSize (&PrimaryHeader, &AllocationSize); UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE); =20 DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__)); @@ -196,7 +196,7 @@ TestSanitizePrimaryHeaderGptEventSize ( NumberOfPartition =3D 13; =20 // that the primary event size is correct - Status =3D SanitizePrimaryHeaderGptEventSize (&PrimaryHeader, NumberOfPa= rtition, &EventSize); + Status =3D Tpm2SanitizePrimaryHeaderGptEventSize (&PrimaryHeader, Number= OfPartition, &EventSize); UT_ASSERT_NOT_EFI_ERROR (Status); =20 // Calculate the existing logic event size @@ -207,12 +207,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 Tpm2SanitizePrimaryHeaderGptEventSize (&PrimaryHeader, MAX_UI= NT32, &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 Tpm2SanitizePrimaryHeaderGptEvent= Size (&PrimaryHeader, NumberOfPartition, &EventSize); UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE); =20 DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__)); @@ -245,7 +245,7 @@ TestSanitizePeImageEventSize ( FilePathSize =3D 255; =20 // Test that a normal PE image passes validation - Status =3D SanitizePeImageEventSize (FilePathSize, &EventSize); + Status =3D Tpm2SanitizePeImageEventSize (FilePathSize, &EventSize); UT_ASSERT_EQUAL (Status, EFI_SUCCESS); =20 // Test that the event size is correct compared to the existing logic @@ -258,7 +258,7 @@ TestSanitizePeImageEventSize ( } =20 // Test that the event size may not overflow - Status =3D SanitizePeImageEventSize (MAX_UINT32, &EventSize); + Status =3D Tpm2SanitizePeImageEventSize (MAX_UINT32, &EventSize); UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE); =20 DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__)); --=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 (#113967): https://edk2.groups.io/g/devel/message/113967 Mute This Topic: https://groups.io/mt/103797462/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-