From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io
Cc: Sami Mujawar <sami.mujawar@arm.com>,
Alexei Fedorov <Alexei.Fedorov@arm.com>
Subject: [PATCH v4 8/8] DynamicTablesPkg: Fix multiple objects parsing
Date: Thu, 9 Dec 2021 10:25:05 +0100 [thread overview]
Message-ID: <20211209092505.1248326-9-Pierre.Gondois@arm.com> (raw)
In-Reply-To: <20211209092505.1248326-1-Pierre.Gondois@arm.com>
From: Pierre Gondois <Pierre.Gondois@arm.com>
When a CmObjDesc contains multiple objects, only the first one is
parsed as the buffer doesn't progress. Fix this.
Also check that the whole buffer has been parsed with an asset.
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
Notes:
v3:
- New patch. [Pierre]
.../ConfigurationManagerObjectParser.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
index 84a35e831471..c1b21d24a402 100644
--- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
+++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
@@ -688,6 +688,7 @@ ParseCmObjDesc (
UINT32 ObjIndex;
UINT32 ObjectCount;
INTN RemainingSize;
+ INTN Offset;
CONST CM_OBJ_PARSER_ARRAY *ParserArray;
if ((CmObjDesc == NULL) || (CmObjDesc->Data == NULL)) {
@@ -722,6 +723,7 @@ ParseCmObjDesc (
ObjectCount = CmObjDesc->Count;
RemainingSize = CmObjDesc->Size;
+ Offset = 0;
for (ObjIndex = 0; ObjIndex < ObjectCount; ObjIndex++) {
DEBUG ((
@@ -733,11 +735,21 @@ ParseCmObjDesc (
ObjectCount
));
PrintCmObjDesc (
- CmObjDesc->Data,
+ (VOID *)((UINTN)CmObjDesc->Data + Offset),
ParserArray->Parser,
ParserArray->ItemCount,
&RemainingSize,
1
);
+ if ((RemainingSize > CmObjDesc->Size) ||
+ (RemainingSize < 0))
+ {
+ ASSERT (0);
+ return;
+ }
+
+ Offset = CmObjDesc->Size - RemainingSize;
} // for
+
+ ASSERT (RemainingSize == 0);
}
--
2.25.1
next prev parent reply other threads:[~2021-12-09 9:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-09 9:24 [PATCH v4 0/8] Create a SSDT PCIe generator PierreGondois
2021-12-09 9:24 ` [PATCH v4 1/8] DynamicTablesPkg: AML Code generation for memory ranges PierreGondois
2021-12-09 9:24 ` [PATCH v4 2/8] DynamicTablesPkg: AML Code generation to create a named Package() PierreGondois
2021-12-09 9:25 ` [PATCH v4 3/8] DynamicTablesPkg: AML Code generation to create a named ResourceTemplate() PierreGondois
2021-12-09 9:25 ` [PATCH v4 4/8] DynamicTablesPkg: AML Code generation to add _PRT entries PierreGondois
2021-12-09 9:25 ` [PATCH v4 5/8] DynamicTablesPkg: Add AmlAttachNode() PierreGondois
2021-12-09 9:25 ` [PATCH v4 6/8] DynamicTablesPkg: Add Pci related objects PierreGondois
2021-12-09 9:25 ` [PATCH v4 7/8] DynamicTablesPkg: SSDT Pci express generator PierreGondois
2021-12-09 9:25 ` PierreGondois [this message]
2021-12-13 12:24 ` [PATCH v4 0/8] Create a SSDT PCIe generator Sami Mujawar
2021-12-13 17:19 ` [edk2-devel] " Sami Mujawar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211209092505.1248326-9-Pierre.Gondois@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox