* [Patch] [edk2-staging] BaseTools: Add checkpoint for that there is no fv ext_header
@ 2021-05-25 6:20 Bob Feng
2021-05-27 5:56 ` Yuwei Chen
0 siblings, 1 reply; 3+ messages in thread
From: Bob Feng @ 2021-05-25 6:20 UTC (permalink / raw)
To: devel; +Cc: Liming Gao, Yuwei Chen
FMMT will crash if there is no fv ext_header in a specific FV.
This patch is going to add a check point for this case.
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
---
BaseTools/Source/C/FMMT/FmmtLib.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c b/BaseTools/Source/C/FMMT/FmmtLib.c
index fa77ed7317..4f6056edba 100644
--- a/BaseTools/Source/C/FMMT/FmmtLib.c
+++ b/BaseTools/Source/C/FMMT/FmmtLib.c
@@ -4544,16 +4544,18 @@ LibEncapNewFvFile(
if (CurrentEncapData != NULL) {
LocalEncapData = CurrentEncapData;
while (LocalEncapData->Level != ParentLevel) {
LocalEncapData = LocalEncapData->NextNode;
}
+ if (LocalEncapData->FvExtHeader !=NULL) {
for (Index = 0; Index <= FvInFd->FfsNumbers; Index++) {
if ((memcmp(&FvInFd->FfsAttuibutes[Index].GuidName, &(LocalEncapData->FvExtHeader->FvName), sizeof(EFI_GUID)) == 0)) {
SubFvId = Index;
break;
}
}
+ }
}
//
// Found FFSs from Fv structure.
//
FfsFoundFlag = FALSE;
--
2.29.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Patch] [edk2-staging] BaseTools: Add checkpoint for that there is no fv ext_header
2021-05-25 6:20 [Patch] [edk2-staging] BaseTools: Add checkpoint for that there is no fv ext_header Bob Feng
@ 2021-05-27 5:56 ` Yuwei Chen
2021-05-28 3:02 ` 回复: " gaoliming
0 siblings, 1 reply; 3+ messages in thread
From: Yuwei Chen @ 2021-05-27 5:56 UTC (permalink / raw)
To: Feng, Bob C, devel@edk2.groups.io; +Cc: Liming Gao
Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>
> -----Original Message-----
> From: Feng, Bob C <bob.c.feng@intel.com>
> Sent: Tuesday, May 25, 2021 2:20 PM
> To: devel@edk2.groups.io
> Cc: Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine
> <yuwei.chen@intel.com>
> Subject: [Patch] [edk2-staging] BaseTools: Add checkpoint for that there is
> no fv ext_header
>
> FMMT will crash if there is no fv ext_header in a specific FV.
> This patch is going to add a check point for this case.
>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> ---
> BaseTools/Source/C/FMMT/FmmtLib.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c
> b/BaseTools/Source/C/FMMT/FmmtLib.c
> index fa77ed7317..4f6056edba 100644
> --- a/BaseTools/Source/C/FMMT/FmmtLib.c
> +++ b/BaseTools/Source/C/FMMT/FmmtLib.c
> @@ -4544,16 +4544,18 @@ LibEncapNewFvFile(
> if (CurrentEncapData != NULL) {
> LocalEncapData = CurrentEncapData;
> while (LocalEncapData->Level != ParentLevel) {
> LocalEncapData = LocalEncapData->NextNode;
> }
> + if (LocalEncapData->FvExtHeader !=NULL) {
> for (Index = 0; Index <= FvInFd->FfsNumbers; Index++) {
> if ((memcmp(&FvInFd->FfsAttuibutes[Index].GuidName,
> &(LocalEncapData->FvExtHeader->FvName), sizeof(EFI_GUID)) == 0)) {
> SubFvId = Index;
> break;
> }
> }
> + }
> }
> //
> // Found FFSs from Fv structure.
> //
> FfsFoundFlag = FALSE;
> --
> 2.29.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* 回复: [Patch] [edk2-staging] BaseTools: Add checkpoint for that there is no fv ext_header
2021-05-27 5:56 ` Yuwei Chen
@ 2021-05-28 3:02 ` gaoliming
0 siblings, 0 replies; 3+ messages in thread
From: gaoliming @ 2021-05-28 3:02 UTC (permalink / raw)
To: 'Chen, Christine', 'Feng, Bob C', devel
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> -----邮件原件-----
> 发件人: Chen, Christine <yuwei.chen@intel.com>
> 发送时间: 2021年5月27日 13:57
> 收件人: Feng, Bob C <bob.c.feng@intel.com>; devel@edk2.groups.io
> 抄送: Liming Gao <gaoliming@byosoft.com.cn>
> 主题: RE: [Patch] [edk2-staging] BaseTools: Add checkpoint for that there
is
> no fv ext_header
>
> Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>
>
> > -----Original Message-----
> > From: Feng, Bob C <bob.c.feng@intel.com>
> > Sent: Tuesday, May 25, 2021 2:20 PM
> > To: devel@edk2.groups.io
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine
> > <yuwei.chen@intel.com>
> > Subject: [Patch] [edk2-staging] BaseTools: Add checkpoint for that there
is
> > no fv ext_header
> >
> > FMMT will crash if there is no fv ext_header in a specific FV.
> > This patch is going to add a check point for this case.
> >
> > Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > ---
> > BaseTools/Source/C/FMMT/FmmtLib.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c
> > b/BaseTools/Source/C/FMMT/FmmtLib.c
> > index fa77ed7317..4f6056edba 100644
> > --- a/BaseTools/Source/C/FMMT/FmmtLib.c
> > +++ b/BaseTools/Source/C/FMMT/FmmtLib.c
> > @@ -4544,16 +4544,18 @@ LibEncapNewFvFile(
> > if (CurrentEncapData != NULL) {
> > LocalEncapData = CurrentEncapData;
> > while (LocalEncapData->Level != ParentLevel) {
> > LocalEncapData = LocalEncapData->NextNode;
> > }
> > + if (LocalEncapData->FvExtHeader !=NULL) {
> > for (Index = 0; Index <= FvInFd->FfsNumbers; Index++) {
> > if
> ((memcmp(&FvInFd->FfsAttuibutes[Index].GuidName,
> > &(LocalEncapData->FvExtHeader->FvName), sizeof(EFI_GUID)) == 0)) {
> > SubFvId = Index;
> > break;
> > }
> > }
> > + }
> > }
> > //
> > // Found FFSs from Fv structure.
> > //
> > FfsFoundFlag = FALSE;
> > --
> > 2.29.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-28 3:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-25 6:20 [Patch] [edk2-staging] BaseTools: Add checkpoint for that there is no fv ext_header Bob Feng
2021-05-27 5:56 ` Yuwei Chen
2021-05-28 3:02 ` 回复: " gaoliming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox