From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.3333.1582251791001726907 for ; Thu, 20 Feb 2020 18:23:11 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: liming.gao@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Feb 2020 18:23:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,466,1574150400"; d="scan'208";a="240206094" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga006.jf.intel.com with ESMTP; 20 Feb 2020 18:23:09 -0800 Received: from shsmsx606.ccr.corp.intel.com (10.109.6.216) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 20 Feb 2020 18:23:08 -0800 Received: from shsmsx606.ccr.corp.intel.com (10.109.6.216) by SHSMSX606.ccr.corp.intel.com (10.109.6.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 21 Feb 2020 10:23:07 +0800 Received: from shsmsx606.ccr.corp.intel.com ([10.109.6.216]) by SHSMSX606.ccr.corp.intel.com ([10.109.6.216]) with mapi id 15.01.1713.004; Fri, 21 Feb 2020 10:23:07 +0800 From: "Liming Gao" To: "Wang, Nickle (HPS SW)" , "devel@edk2.groups.io" , "Bi, Dandan" Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. Thread-Topic: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZeroGuid() ASSERT. Thread-Index: AQHV5zAxpbw4LUtwD0qs/UnjhkDSMagjObwAgADpXXCAAEOegIAAhmUw Date: Fri, 21 Feb 2020 02:23:07 +0000 Message-ID: <83c28f9888a6461e9ff73adbdd91b4ee@intel.com> References: <20200219142240.10448-1-nickle.wang@hpe.com> <3C0D5C461C9E904E8F62152F6274C0BB40D4473F@SHSMSX104.ccr.corp.intel.com> <9d20d94f6d8e4c12b5a3f1fd89c4b45b@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action x-originating-ip: [10.239.127.36] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Do you request to catch this fix into this edk2 stable tag 202002? > -----Original Message----- > From: Wang, Nickle (HPS SW) > Sent: Friday, February 21, 2020 10:21 AM > To: Gao, Liming ; devel@edk2.groups.io; Bi, Dandan= > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZe= roGuid() ASSERT. >=20 > Hi Liming, >=20 > Yes, I made a function and call GetIfrBinaryData() with NULL value to se= cond parameter. Then I see system assert. >=20 > Thanks, > Nickle >=20 > -----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 ; Wang, Nickle= (HPS SW) > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/SetupBrowserDxe: Fix IsZe= roGuid() ASSERT. >=20 > Nickle: > Is this a real issue found in production? >=20 > Thanks > Liming > > -----Original Message----- > > From: 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 Is= ZeroGuid() 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-F= ormat, Line length of commit message should be less than > 76 characters when possible. > > Please address it when submit the patch. > > Reviewed-by: Dandan Bi > > > > > > 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 > > > 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 > > > --- > > > 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.
> > > +(C) Copyright 2020 Hewlett Packard Enterprise Development LP
> > > 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 > > > > > > > > > > > > > > >=20 >=20