From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web09.59726.1638833744171095202 for ; Mon, 06 Dec 2021 15:35:44 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=TaCM8hp6; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (c-73-27-179-174.hsd1.fl.comcast.net [73.27.179.174]) by linux.microsoft.com (Postfix) with ESMTPSA id D36A720E6F21; Mon, 6 Dec 2021 15:35:42 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D36A720E6F21 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638833743; bh=iC0bCE5GJCOc0/UtQpNuMw8J6rtndmp1GjBjYtR8dNg=; h=From:To:Cc:Subject:Date:From; b=TaCM8hp6HkB/HEZJ4Q1NN0P80+G9B/KGioyzR+lVGbIgyqilceXDVHQ/s4l0XB5fN 4Iq6ejsBOSS5ps+MJ5uvSd9QFy+gT4/5p7UwkRJXqJnD5HkMBSWNMji4EWKv/mRuJ/ Exofs1RLRZyQvqM7mrnfFefDvbU7A0STaArqGFX0= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Chasel Chiu , Nate DeSimone , Liming Gao , Eric Dong Subject: [edk2-platforms][PATCH v1 1/1] MinPlatformPkg/TestPointCheckLib: Fix DMAR structure length calculation Date: Mon, 6 Dec 2021 18:35:20 -0500 Message-Id: <20211206233520.1801-1-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Kubacki REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3768 When processing DMAR structures of type EFI_ACPI_DMAR_STRUCTURE_HEADER within the ACPI DMAR table, the code determines the structure length by subtracting the DMAR structure headers present from the overall DMAR ACPI table size. The terminating condition is that the remaining total DMAR length is greater than zero. However, the current DMAR structure length is subtracted after the DMAR structure pointer has already been assigned to the next structure. This change subtracts the current DMAR structure length before transitioning to the next structure. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Michael Kubacki --- Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcp= iDmar.c | 4 ++-- Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDma= Protection.c | 2 +- Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckDma= Protection.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib= /DxeCheckAcpiDmar.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPoin= tCheckLib/DxeCheckAcpiDmar.c index b2279966d8ed..c20ef58dbacf 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeChe= ckAcpiDmar.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeChe= ckAcpiDmar.c @@ -204,8 +204,8 @@ DumpAcpiDmar ( DEBUG ((DEBUG_INFO, "\n")); break; } - DmarStructHeader =3D (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINT8 *)Dma= rStructHeader + DmarStructHeader->Length); DmarLen -=3D DmarStructHeader->Length; + DmarStructHeader =3D (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINT8 *)Dma= rStructHeader + DmarStructHeader->Length); } } =20 @@ -232,8 +232,8 @@ CheckAcpiDmar ( default: break; } - DmarStructHeader =3D (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINT8 *)Dma= rStructHeader + DmarStructHeader->Length); DmarLen -=3D DmarStructHeader->Length; + DmarStructHeader =3D (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINT8 *)Dma= rStructHeader + DmarStructHeader->Length); } return EFI_SUCCESS; } \ No newline at end of file diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib= /DxeCheckDmaProtection.c b/Platform/Intel/MinPlatformPkg/Test/Library/Tes= tPointCheckLib/DxeCheckDmaProtection.c index 10b44fe8b9b8..105c8f23e3bd 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeChe= ckDmaProtection.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeChe= ckDmaProtection.c @@ -56,8 +56,8 @@ CheckDrhd ( default: break; } - DmarStructHeader =3D (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINT8 *)Dma= rStructHeader + DmarStructHeader->Length); DmarLen -=3D DmarStructHeader->Length; + DmarStructHeader =3D (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINT8 *)Dma= rStructHeader + DmarStructHeader->Length); } =20 return EFI_SUCCESS; diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib= /PeiCheckDmaProtection.c b/Platform/Intel/MinPlatformPkg/Test/Library/Tes= tPointCheckLib/PeiCheckDmaProtection.c index cb764b3633ef..9054b9944e0c 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiChe= ckDmaProtection.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiChe= ckDmaProtection.c @@ -61,8 +61,8 @@ CheckDrhd ( default: break; } - DmarStructHeader =3D (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINT8 *)Dma= rStructHeader + DmarStructHeader->Length); DmarLen -=3D DmarStructHeader->Length; + DmarStructHeader =3D (EFI_ACPI_DMAR_STRUCTURE_HEADER *)((UINT8 *)Dma= rStructHeader + DmarStructHeader->Length); } =20 return EFI_SUCCESS; --=20 2.28.0.windows.1