* [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. @ 2020-02-19 14:22 nickle.wang 2020-02-20 8:24 ` [edk2-devel] " Dandan Bi 0 siblings, 1 reply; 7+ messages in thread From: nickle.wang @ 2020-02-19 14:22 UTC (permalink / raw) To: devel, nickle.wang; +Cc: dandan.bi >From the function description of GetIfrBinaryData(), FormSetGuid can be NULL. However, FormSetGuid is passed to IsZeroGuid(). This causes exception when FormSetGuid is NULL. Signed-off-by: Nickle Wang <nickle.wang@hpe.com> --- MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c index 288f1c3197..82067b541c 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c @@ -2,6 +2,7 @@ Entry and initialization module for the browser. Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR> +(C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -5844,7 +5845,7 @@ GetIfrBinaryData ( // // Try to compare against formset GUID // - if (IsZeroGuid (FormSetGuid) || + if (IsZeroGuid (ComparingGuid) || CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) { break; } -- 2.20.1.windows.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. 2020-02-19 14:22 [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT nickle.wang @ 2020-02-20 8:24 ` Dandan Bi 2020-02-20 14:20 ` Liming Gao 2020-02-21 2:17 ` Nickle Wang 0 siblings, 2 replies; 7+ messages in thread From: Dandan Bi @ 2020-02-20 8:24 UTC (permalink / raw) To: devel@edk2.groups.io, nickle.wang@hpe.com Thanks Nickle for the fix. One minor comment is that please pay attention to the format of commit message. Refer to https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-Format, Line length of commit message should be less than 76 characters when possible. Please address it when submit the patch. Reviewed-by: Dandan Bi <dandan.bi@intel.com> Thanks, Dandan > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Nickle Wang > Sent: Wednesday, February 19, 2020 10:23 PM > To: devel@edk2.groups.io; nickle.wang@hpe.com > Cc: Bi, Dandan <dandan.bi@intel.com> > Subject: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix > IsZeroGuid() ASSERT. > > From the function description of GetIfrBinaryData(), FormSetGuid can be > NULL. However, FormSetGuid is passed to IsZeroGuid(). This causes > exception when FormSetGuid is NULL. > > Signed-off-by: Nickle Wang <nickle.wang@hpe.com> > --- > MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > index 288f1c3197..82067b541c 100644 > --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > @@ -2,6 +2,7 @@ > Entry and initialization module for the browser. > > Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR> > +(C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR> > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -5844,7 +5845,7 @@ GetIfrBinaryData ( > // > // Try to compare against formset GUID > // > - if (IsZeroGuid (FormSetGuid) || > + if (IsZeroGuid (ComparingGuid) || > CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + sizeof > (EFI_IFR_OP_HEADER)))) { > break; > } > -- > 2.20.1.windows.1 > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. 2020-02-20 8:24 ` [edk2-devel] " Dandan Bi @ 2020-02-20 14:20 ` Liming Gao 2020-02-21 2:21 ` Nickle Wang 2020-02-21 2:17 ` Nickle Wang 1 sibling, 1 reply; 7+ messages in thread From: Liming Gao @ 2020-02-20 14:20 UTC (permalink / raw) To: devel@edk2.groups.io, Bi, Dandan, nickle.wang@hpe.com Nickle: Is this a real issue found in production? Thanks Liming > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Dandan Bi > Sent: Thursday, February 20, 2020 4:24 PM > To: devel@edk2.groups.io; nickle.wang@hpe.com > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. > > Thanks Nickle for the fix. > One minor comment is that please pay attention to the format of commit message. > Refer to https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-Format, Line length of commit message should be less > than 76 characters when possible. > Please address it when submit the patch. > Reviewed-by: Dandan Bi <dandan.bi@intel.com> > > > Thanks, > Dandan > > > -----Original Message----- > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > > Nickle Wang > > Sent: Wednesday, February 19, 2020 10:23 PM > > To: devel@edk2.groups.io; nickle.wang@hpe.com > > Cc: Bi, Dandan <dandan.bi@intel.com> > > Subject: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix > > IsZeroGuid() ASSERT. > > > > From the function description of GetIfrBinaryData(), FormSetGuid can be > > NULL. However, FormSetGuid is passed to IsZeroGuid(). This causes > > exception when FormSetGuid is NULL. > > > > Signed-off-by: Nickle Wang <nickle.wang@hpe.com> > > --- > > MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > index 288f1c3197..82067b541c 100644 > > --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > @@ -2,6 +2,7 @@ > > Entry and initialization module for the browser. > > > > Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR> > > +(C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR> > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > **/ > > @@ -5844,7 +5845,7 @@ GetIfrBinaryData ( > > // > > // Try to compare against formset GUID > > // > > - if (IsZeroGuid (FormSetGuid) || > > + if (IsZeroGuid (ComparingGuid) || > > CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + sizeof > > (EFI_IFR_OP_HEADER)))) { > > break; > > } > > -- > > 2.20.1.windows.1 > > > > > > > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. 2020-02-20 14:20 ` Liming Gao @ 2020-02-21 2:21 ` Nickle Wang 2020-02-21 2:23 ` Liming Gao 0 siblings, 1 reply; 7+ messages in thread From: Nickle Wang @ 2020-02-21 2:21 UTC (permalink / raw) To: Gao, Liming, devel@edk2.groups.io, Bi, Dandan Hi Liming, Yes, I made a function and call GetIfrBinaryData() with NULL value to second parameter. Then I see system assert. Thanks, Nickle -----Original Message----- From: Gao, Liming [mailto:liming.gao@intel.com] Sent: Thursday, February 20, 2020 10:20 PM To: devel@edk2.groups.io; Bi, Dandan <dandan.bi@intel.com>; Wang, Nickle (HPS SW) <nickle.wang@hpe.com> Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. Nickle: Is this a real issue found in production? Thanks Liming > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Dandan > Bi > Sent: Thursday, February 20, 2020 4:24 PM > To: devel@edk2.groups.io; nickle.wang@hpe.com > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. > > Thanks Nickle for the fix. > One minor comment is that please pay attention to the format of commit message. > Refer to > https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-Format, Line length of commit message should be less than 76 characters when possible. > Please address it when submit the patch. > Reviewed-by: Dandan Bi <dandan.bi@intel.com> > > > Thanks, > Dandan > > > -----Original Message----- > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf > > Of Nickle Wang > > Sent: Wednesday, February 19, 2020 10:23 PM > > To: devel@edk2.groups.io; nickle.wang@hpe.com > > Cc: Bi, Dandan <dandan.bi@intel.com> > > Subject: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix > > IsZeroGuid() ASSERT. > > > > From the function description of GetIfrBinaryData(), FormSetGuid can > > be NULL. However, FormSetGuid is passed to IsZeroGuid(). This causes > > exception when FormSetGuid is NULL. > > > > Signed-off-by: Nickle Wang <nickle.wang@hpe.com> > > --- > > MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > index 288f1c3197..82067b541c 100644 > > --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > @@ -2,6 +2,7 @@ > > Entry and initialization module for the browser. > > > > Copyright (c) 2007 - 2018, Intel Corporation. All rights > > reserved.<BR> > > +(C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR> > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > **/ > > @@ -5844,7 +5845,7 @@ GetIfrBinaryData ( > > // > > // Try to compare against formset GUID > > // > > - if (IsZeroGuid (FormSetGuid) || > > + if (IsZeroGuid (ComparingGuid) || > > CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + > > sizeof > > (EFI_IFR_OP_HEADER)))) { > > break; > > } > > -- > > 2.20.1.windows.1 > > > > > > > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. 2020-02-21 2:21 ` Nickle Wang @ 2020-02-21 2:23 ` Liming Gao 2020-02-21 2:25 ` Nickle Wang 0 siblings, 1 reply; 7+ messages in thread From: Liming Gao @ 2020-02-21 2:23 UTC (permalink / raw) To: Wang, Nickle (HPS SW), devel@edk2.groups.io, Bi, Dandan Do you request to catch this fix into this edk2 stable tag 202002? > -----Original Message----- > From: Wang, Nickle (HPS SW) <nickle.wang@hpe.com> > Sent: Friday, February 21, 2020 10:21 AM > To: Gao, Liming <liming.gao@intel.com>; devel@edk2.groups.io; Bi, Dandan <dandan.bi@intel.com> > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. > > Hi Liming, > > Yes, I made a function and call GetIfrBinaryData() with NULL value to second parameter. Then I see system assert. > > Thanks, > Nickle > > -----Original Message----- > From: Gao, Liming [mailto:liming.gao@intel.com] > Sent: Thursday, February 20, 2020 10:20 PM > To: devel@edk2.groups.io; Bi, Dandan <dandan.bi@intel.com>; Wang, Nickle (HPS SW) <nickle.wang@hpe.com> > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. > > Nickle: > Is this a real issue found in production? > > Thanks > Liming > > -----Original Message----- > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Dandan > > Bi > > Sent: Thursday, February 20, 2020 4:24 PM > > To: devel@edk2.groups.io; nickle.wang@hpe.com > > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. > > > > Thanks Nickle for the fix. > > One minor comment is that please pay attention to the format of commit message. > > Refer to > > https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-Format, Line length of commit message should be less than > 76 characters when possible. > > Please address it when submit the patch. > > Reviewed-by: Dandan Bi <dandan.bi@intel.com> > > > > > > Thanks, > > Dandan > > > > > -----Original Message----- > > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf > > > Of Nickle Wang > > > Sent: Wednesday, February 19, 2020 10:23 PM > > > To: devel@edk2.groups.io; nickle.wang@hpe.com > > > Cc: Bi, Dandan <dandan.bi@intel.com> > > > Subject: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix > > > IsZeroGuid() ASSERT. > > > > > > From the function description of GetIfrBinaryData(), FormSetGuid can > > > be NULL. However, FormSetGuid is passed to IsZeroGuid(). This causes > > > exception when FormSetGuid is NULL. > > > > > > Signed-off-by: Nickle Wang <nickle.wang@hpe.com> > > > --- > > > MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > > b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > > index 288f1c3197..82067b541c 100644 > > > --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > > +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > > @@ -2,6 +2,7 @@ > > > Entry and initialization module for the browser. > > > > > > Copyright (c) 2007 - 2018, Intel Corporation. All rights > > > reserved.<BR> > > > +(C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR> > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > **/ > > > @@ -5844,7 +5845,7 @@ GetIfrBinaryData ( > > > // > > > // Try to compare against formset GUID > > > // > > > - if (IsZeroGuid (FormSetGuid) || > > > + if (IsZeroGuid (ComparingGuid) || > > > CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + > > > sizeof > > > (EFI_IFR_OP_HEADER)))) { > > > break; > > > } > > > -- > > > 2.20.1.windows.1 > > > > > > > > > > > > > > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. 2020-02-21 2:23 ` Liming Gao @ 2020-02-21 2:25 ` Nickle Wang 0 siblings, 0 replies; 7+ messages in thread From: Nickle Wang @ 2020-02-21 2:25 UTC (permalink / raw) To: Gao, Liming, devel@edk2.groups.io, Bi, Dandan No, I can have a dummy variable to work around this issue. Nickle -----Original Message----- From: Gao, Liming [mailto:liming.gao@intel.com] Sent: Friday, February 21, 2020 10:23 AM To: Wang, Nickle (HPS SW) <nickle.wang@hpe.com>; devel@edk2.groups.io; Bi, Dandan <dandan.bi@intel.com> Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. Do you request to catch this fix into this edk2 stable tag 202002? > -----Original Message----- > From: Wang, Nickle (HPS SW) <nickle.wang@hpe.com> > Sent: Friday, February 21, 2020 10:21 AM > To: Gao, Liming <liming.gao@intel.com>; devel@edk2.groups.io; Bi, > Dandan <dandan.bi@intel.com> > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. > > Hi Liming, > > Yes, I made a function and call GetIfrBinaryData() with NULL value to second parameter. Then I see system assert. > > Thanks, > Nickle > > -----Original Message----- > From: Gao, Liming [mailto:liming.gao@intel.com] > Sent: Thursday, February 20, 2020 10:20 PM > To: devel@edk2.groups.io; Bi, Dandan <dandan.bi@intel.com>; Wang, > Nickle (HPS SW) <nickle.wang@hpe.com> > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. > > Nickle: > Is this a real issue found in production? > > Thanks > Liming > > -----Original Message----- > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of > > Dandan Bi > > Sent: Thursday, February 20, 2020 4:24 PM > > To: devel@edk2.groups.io; nickle.wang@hpe.com > > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. > > > > Thanks Nickle for the fix. > > One minor comment is that please pay attention to the format of commit message. > > Refer to > > https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message > > -Format, Line length of commit message should be less than > 76 characters when possible. > > Please address it when submit the patch. > > Reviewed-by: Dandan Bi <dandan.bi@intel.com> > > > > > > Thanks, > > Dandan > > > > > -----Original Message----- > > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf > > > Of Nickle Wang > > > Sent: Wednesday, February 19, 2020 10:23 PM > > > To: devel@edk2.groups.io; nickle.wang@hpe.com > > > Cc: Bi, Dandan <dandan.bi@intel.com> > > > Subject: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix > > > IsZeroGuid() ASSERT. > > > > > > From the function description of GetIfrBinaryData(), FormSetGuid > > > can be NULL. However, FormSetGuid is passed to IsZeroGuid(). This > > > causes exception when FormSetGuid is NULL. > > > > > > Signed-off-by: Nickle Wang <nickle.wang@hpe.com> > > > --- > > > MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > > b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > > index 288f1c3197..82067b541c 100644 > > > --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > > +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > > > @@ -2,6 +2,7 @@ > > > Entry and initialization module for the browser. > > > > > > Copyright (c) 2007 - 2018, Intel Corporation. All rights > > > reserved.<BR> > > > +(C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR> > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > **/ > > > @@ -5844,7 +5845,7 @@ GetIfrBinaryData ( > > > // > > > // Try to compare against formset GUID > > > // > > > - if (IsZeroGuid (FormSetGuid) || > > > + if (IsZeroGuid (ComparingGuid) || > > > CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData > > > + sizeof > > > (EFI_IFR_OP_HEADER)))) { > > > break; > > > } > > > -- > > > 2.20.1.windows.1 > > > > > > > > > > > > > > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. 2020-02-20 8:24 ` [edk2-devel] " Dandan Bi 2020-02-20 14:20 ` Liming Gao @ 2020-02-21 2:17 ` Nickle Wang 1 sibling, 0 replies; 7+ messages in thread From: Nickle Wang @ 2020-02-21 2:17 UTC (permalink / raw) To: devel@edk2.groups.io, dandan.bi@intel.com; +Cc: Wang, Nickle (HPS SW) Hi Dandan, Thanks for your reminder. I update my patch and it passed BaseTools/Scripts/PatchCheck.py test. Nickle -----Original Message----- From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Dandan Bi Sent: Thursday, February 20, 2020 4:24 PM To: devel@edk2.groups.io; Wang, Nickle (HPS SW) <nickle.wang@hpe.com> Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. Thanks Nickle for the fix. One minor comment is that please pay attention to the format of commit message. Refer to https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-Format, Line length of commit message should be less than 76 characters when possible. Please address it when submit the patch. Reviewed-by: Dandan Bi <dandan.bi@intel.com> Thanks, Dandan > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Nickle Wang > Sent: Wednesday, February 19, 2020 10:23 PM > To: devel@edk2.groups.io; nickle.wang@hpe.com > Cc: Bi, Dandan <dandan.bi@intel.com> > Subject: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix > IsZeroGuid() ASSERT. > > From the function description of GetIfrBinaryData(), FormSetGuid can > be NULL. However, FormSetGuid is passed to IsZeroGuid(). This causes > exception when FormSetGuid is NULL. > > Signed-off-by: Nickle Wang <nickle.wang@hpe.com> > --- > MdeModulePkg/Universal/SetupBrowserDxe/Setup.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > index 288f1c3197..82067b541c 100644 > --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c > @@ -2,6 +2,7 @@ > Entry and initialization module for the browser. > > Copyright (c) 2007 - 2018, Intel Corporation. All rights > reserved.<BR> > +(C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR> > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -5844,7 +5845,7 @@ GetIfrBinaryData ( > // > // Try to compare against formset GUID > // > - if (IsZeroGuid (FormSetGuid) || > + if (IsZeroGuid (ComparingGuid) || > CompareGuid (ComparingGuid, (EFI_GUID *)(OpCodeData + > sizeof > (EFI_IFR_OP_HEADER)))) { > break; > } > -- > 2.20.1.windows.1 > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-02-21 2:25 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-02-19 14:22 [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT nickle.wang 2020-02-20 8:24 ` [edk2-devel] " Dandan Bi 2020-02-20 14:20 ` Liming Gao 2020-02-21 2:21 ` Nickle Wang 2020-02-21 2:23 ` Liming Gao 2020-02-21 2:25 ` Nickle Wang 2020-02-21 2:17 ` Nickle Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox