* [PATCH v1] DynamicTablesPkg: Fix using RmrNodeCount unitlitialised
@ 2022-08-04 9:20 Edward Pickup
2022-08-06 6:46 ` Sami Mujawar
0 siblings, 1 reply; 2+ messages in thread
From: Edward Pickup @ 2022-08-04 9:20 UTC (permalink / raw)
To: devel; +Cc: Sami.Mujawar, Alexei.Fedorov, nd
Fix using RmrNodeCount uninitliased by initliasing it to zero. Also, add
an additional check for ACPI version. This fixes a crash running on
kvmtool.
Signed-off-by: Edward Pickup <edward.pickup@arm.com>
---
Change can be seen at https://github.com/edpickup/edk2/tree/2322_rmrnodecount_uninitialised_v1
DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
index 40d99162cc610de2d0c2f0a5fff6e457c08d07fb..f28973c1a8620aa5b756e85af1b46ebfaf018839 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
@@ -2107,6 +2107,8 @@ BuildIortTable (
ASSERT (AcpiTableInfo->TableGeneratorId == This->GeneratorID);
ASSERT (AcpiTableInfo->AcpiTableSignature == This->AcpiTableSignature);
+ RmrNodeCount = 0;
+
if ((AcpiTableInfo->AcpiTableRevision < This->MinAcpiTableRevision) ||
(AcpiTableInfo->AcpiTableRevision > This->AcpiTableRevision))
{
@@ -2714,7 +2716,10 @@ BuildIortTable (
}
}
- if (RmrNodeCount > 0) {
+ if ((AcpiTableInfo->AcpiTableRevision >=
+ EFI_ACPI_IO_REMAPPING_TABLE_REVISION_05) &&
+ (RmrNodeCount > 0))
+ {
Status = AddRmrNodes (
This,
CfgMgrProtocol,
--
Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v1] DynamicTablesPkg: Fix using RmrNodeCount unitlitialised
2022-08-04 9:20 [PATCH v1] DynamicTablesPkg: Fix using RmrNodeCount unitlitialised Edward Pickup
@ 2022-08-06 6:46 ` Sami Mujawar
0 siblings, 0 replies; 2+ messages in thread
From: Sami Mujawar @ 2022-08-06 6:46 UTC (permalink / raw)
To: Edward Pickup, devel; +Cc: Alexei.Fedorov, nd, nd@arm.com
Hi Edward,
Thank you for this patch.
This fix looks good to me.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 04/08/2022 10:20 am, Edward Pickup wrote:
> Fix using RmrNodeCount uninitliased by initliasing it to zero. Also, add
> an additional check for ACPI version. This fixes a crash running on
> kvmtool.
>
> Signed-off-by: Edward Pickup <edward.pickup@arm.com>
> ---
>
> Change can be seen at https://github.com/edpickup/edk2/tree/2322_rmrnodecount_uninitialised_v1
>
> DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
> index 40d99162cc610de2d0c2f0a5fff6e457c08d07fb..f28973c1a8620aa5b756e85af1b46ebfaf018839 100644
> --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
> +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c
> @@ -2107,6 +2107,8 @@ BuildIortTable (
> ASSERT (AcpiTableInfo->TableGeneratorId == This->GeneratorID);
>
> ASSERT (AcpiTableInfo->AcpiTableSignature == This->AcpiTableSignature);
>
>
>
> + RmrNodeCount = 0;
>
> +
>
> if ((AcpiTableInfo->AcpiTableRevision < This->MinAcpiTableRevision) ||
>
> (AcpiTableInfo->AcpiTableRevision > This->AcpiTableRevision))
>
> {
>
> @@ -2714,7 +2716,10 @@ BuildIortTable (
> }
>
> }
>
>
>
> - if (RmrNodeCount > 0) {
>
> + if ((AcpiTableInfo->AcpiTableRevision >=
>
> + EFI_ACPI_IO_REMAPPING_TABLE_REVISION_05) &&
>
> + (RmrNodeCount > 0))
>
> + {
>
> Status = AddRmrNodes (
>
> This,
>
> CfgMgrProtocol,
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-06 6:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-04 9:20 [PATCH v1] DynamicTablesPkg: Fix using RmrNodeCount unitlitialised Edward Pickup
2022-08-06 6:46 ` Sami Mujawar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox