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 1D91BAC16F4 for ; Wed, 17 Jan 2024 22:47:34 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=iTBAZJs9M8vuU79lMDpiXdn/GCsPWZ4stqTkLgxuEiM=; 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=DOAyLjRVoD5/ZSIRgLvocEVoH+xns6oTe+3rBYdyBZ/Y3lWl9WoNLuv5XEqh5FoyDI5P8kEz csyVT9jE6g0GpdhwaPN66RSl+OWSq/Tc5g7LERPnIIfmQkDYt0ca1+UdpfXlsJGzlAWRVzcIMgD XWQu6fzoqwu+m4PPl/dRQHvc= X-Received: by 127.0.0.2 with SMTP id IgvvYY7687511xCL3ZTomJNx; 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: ySHuZ0wdQT7GiyHLvXLYyk21x7686176AA= 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-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=DOAyLjRV; dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io 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 @@ **/=0D EFI_STATUS=0D EFIAPI=0D -SanitizeEfiPartitionTableHeader (=0D +Tpm2SanitizeEfiPartitionTableHeader (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D IN CONST EFI_BLOCK_IO_PROTOCOL *BlockIo=0D );=0D @@ -78,7 +78,7 @@ SanitizeEfiPartitionTableHeader ( **/=0D EFI_STATUS=0D EFIAPI=0D -SanitizePrimaryHeaderAllocationSize (=0D +Tpm2SanitizePrimaryHeaderAllocationSize (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D OUT UINT32 *AllocationSize=0D );=0D @@ -107,7 +107,7 @@ SanitizePrimaryHeaderAllocationSize ( One of the passed parameters was invalid.=0D **/=0D EFI_STATUS=0D -SanitizePrimaryHeaderGptEventSize (=0D +Tpm2SanitizePrimaryHeaderGptEventSize (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D IN UINTN NumberOfPartition,=0D OUT UINT32 *EventSize=0D @@ -131,7 +131,7 @@ SanitizePrimaryHeaderGptEventSize ( One of the passed parameters was invalid.=0D **/=0D EFI_STATUS=0D -SanitizePeImageEventSize (=0D +Tpm2SanitizePeImageEventSize (=0D IN UINT32 FilePathSize,=0D OUT UINT32 *EventSize=0D );=0D 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,=0D (UINT8 *)PrimaryHeader=0D );=0D - if (EFI_ERROR (Status) || EFI_ERROR (SanitizeEfiPartitionTableHeader (Pr= imaryHeader, BlockIo))) {=0D + if (EFI_ERROR (Status) || EFI_ERROR (Tpm2SanitizeEfiPartitionTableHeader= (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 @@ -209,7 +209,7 @@ Tcg2MeasureGptTable ( //=0D // Read the partition entry.=0D //=0D - Status =3D SanitizePrimaryHeaderAllocationSize (PrimaryHeader, &AllocSiz= e);=0D + Status =3D Tpm2SanitizePrimaryHeaderAllocationSize (PrimaryHeader, &Allo= cSize);=0D if (EFI_ERROR (Status)) {=0D FreePool (PrimaryHeader);=0D return EFI_BAD_BUFFER_SIZE;=0D @@ -250,7 +250,7 @@ Tcg2MeasureGptTable ( //=0D // Prepare Data for Measurement (CcProtocol and Tcg2Protocol)=0D //=0D - Status =3D SanitizePrimaryHeaderGptEventSize (PrimaryHeader, NumberOfPar= tition, &TcgEventSize);=0D + Status =3D Tpm2SanitizePrimaryHeaderGptEventSize (PrimaryHeader, NumberO= fPartition, &TcgEventSize);=0D if (EFI_ERROR (Status)) {=0D FreePool (PrimaryHeader);=0D FreePool (EntryPtr);=0D @@ -420,7 +420,7 @@ Tcg2MeasurePeImage ( }=0D =0D FilePathSize =3D (UINT32)GetDevicePathSize (FilePath);=0D - Status =3D SanitizePeImageEventSize (FilePathSize, &EventSize);=0D + Status =3D Tpm2SanitizePeImageEventSize (FilePathSize, &EventSize)= ;=0D if (EFI_ERROR (Status)) {=0D return EFI_UNSUPPORTED;=0D }=0D 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 @@ **/=0D EFI_STATUS=0D EFIAPI=0D -SanitizeEfiPartitionTableHeader (=0D +Tpm2SanitizeEfiPartitionTableHeader (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D IN CONST EFI_BLOCK_IO_PROTOCOL *BlockIo=0D )=0D @@ -169,7 +169,7 @@ SanitizeEfiPartitionTableHeader ( **/=0D EFI_STATUS=0D EFIAPI=0D -SanitizePrimaryHeaderAllocationSize (=0D +Tpm2SanitizePrimaryHeaderAllocationSize (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D OUT UINT32 *AllocationSize=0D )=0D @@ -221,7 +221,7 @@ SanitizePrimaryHeaderAllocationSize ( One of the passed parameters was invalid.=0D **/=0D EFI_STATUS=0D -SanitizePrimaryHeaderGptEventSize (=0D +Tpm2SanitizePrimaryHeaderGptEventSize (=0D IN CONST EFI_PARTITION_TABLE_HEADER *PrimaryHeader,=0D IN UINTN NumberOfPartition,=0D OUT UINT32 *EventSize=0D @@ -292,7 +292,7 @@ SanitizePrimaryHeaderGptEventSize ( One of the passed parameters was invalid.=0D **/=0D EFI_STATUS=0D -SanitizePeImageEventSize (=0D +Tpm2SanitizePeImageEventSize (=0D IN UINT32 FilePathSize,=0D OUT UINT32 *EventSize=0D )=0D 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);=0D =0D // Test that a normal PrimaryHeader passes validation=0D - Status =3D SanitizeEfiPartitionTableHeader (&PrimaryHeader, &BlockIo);=0D + Status =3D Tpm2SanitizeEfiPartitionTableHeader (&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 Tpm2SanitizeEfiPartitionTable= Header (&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 Tpm2SanitizeEfiPartitionTableHeader = (&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 Tpm2SanitizeEfiPartitionTableHead= er (&PrimaryHeader, &BlockIo);=0D UT_ASSERT_EQUAL (Status, EFI_DEVICE_ERROR);=0D =0D DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__));=0D @@ -137,7 +137,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 Tpm2SanitizePrimaryHeaderAllocationSize (&PrimaryHeader, &All= ocationSize);=0D UT_ASSERT_NOT_EFI_ERROR (Status);=0D =0D // Test that the allocation size is correct compared to the existing log= ic=0D @@ -146,19 +146,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 Tpm2SanitizePrimaryHeaderAllo= cationSize (&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 Tpm2SanitizePrimaryHeaderAllo= cationSize (&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 Tpm2SanitizePrimaryHeaderAllo= cationSize (&PrimaryHeader, &AllocationSize);=0D UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE);=0D =0D DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__));=0D @@ -196,7 +196,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 Tpm2SanitizePrimaryHeaderGptEventSize (&PrimaryHeader, Number= OfPartition, &EventSize);=0D UT_ASSERT_NOT_EFI_ERROR (Status);=0D =0D // Calculate the existing logic event size=0D @@ -207,12 +207,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 Tpm2SanitizePrimaryHeaderGptEventSize (&PrimaryHeader, MAX_UI= NT32, &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 Tpm2SanitizePrimaryHeaderGptEvent= Size (&PrimaryHeader, NumberOfPartition, &EventSize);=0D UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE);=0D =0D DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__));=0D @@ -245,7 +245,7 @@ TestSanitizePeImageEventSize ( FilePathSize =3D 255;=0D =0D // Test that a normal PE image passes validation=0D - Status =3D SanitizePeImageEventSize (FilePathSize, &EventSize);=0D + Status =3D Tpm2SanitizePeImageEventSize (FilePathSize, &EventSize);=0D UT_ASSERT_EQUAL (Status, EFI_SUCCESS);=0D =0D // Test that the event size is correct compared to the existing logic=0D @@ -258,7 +258,7 @@ TestSanitizePeImageEventSize ( }=0D =0D // Test that the event size may not overflow=0D - Status =3D SanitizePeImageEventSize (MAX_UINT32, &EventSize);=0D + Status =3D Tpm2SanitizePeImageEventSize (MAX_UINT32, &EventSize);=0D UT_ASSERT_EQUAL (Status, EFI_BAD_BUFFER_SIZE);=0D =0D DEBUG ((DEBUG_INFO, "%a: Test passed\n", __func__));=0D --=20 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- 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/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-