From nobody Fri Apr 26 12:04:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49668+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49668+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572445638; cv=none; d=zoho.com; s=zohoarc; b=HiZW1VmN558XWy1fjiCuTi1UKi8JdPB+EAxgNSCEUFS3wHcyvB363ZSlF32l/WSA3/6UNybAQeQJVbmPsdJAKeEVoQc9CU1nLcYII8BleSFj/xP3ErYrLu5oQ1sAUipEpURaUYqEL5Tv86L9Fq3gFVYmOnj47xBLHKBSz06w9X8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572445638; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=37uNz7iFCk7kfIe01PlL1C3PL70n+mtQfpaYp9XOfcY=; b=MUROor9GY2O8G4q19m5nJD3NUsfCI5HKizqCFsB67pd9fqQzvR83tL9fqUPLQLP65wN+274BZNE9CdU83E6THJJ9rboiROS78C1uzo1JA/BhB8u5cjeNfUAcMxMgqBCER0JknoTgZiGgoU3B5mtQG4hjsKVYiskcK5hGJvJ4OEI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49668+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572445638328872.9549748040594; Wed, 30 Oct 2019 07:27:18 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Wed, 30 Oct 2019 07:27:17 -0700 X-Received: from mga07.intel.com (mga07.intel.com []) by mx.groups.io with SMTP id smtpd.web11.5643.1572445636099601571 for ; Wed, 30 Oct 2019 07:27:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2019 07:27:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,247,1569308400"; d="scan'208";a="203895367" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 30 Oct 2019 07:27:16 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu Subject: [edk2-devel] [PATCH v2 1/4] MdeModulePkg/EbcDebugger: Add check for Entry and RetEntry Date: Wed, 30 Oct 2019 22:27:07 +0800 Message-Id: <20191030142710.42756-2-shenglei.zhang@intel.com> In-Reply-To: <20191030142710.42756-1-shenglei.zhang@intel.com> References: <20191030142710.42756-1-shenglei.zhang@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,shenglei.zhang@intel.com X-Gm-Message-State: aaaaaaaaaaaaaaaaaaaaaaaax1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572445637; bh=iiELdqD0+y3hVIfP1Bp+CM/O9gAab3BPL83khKNiJCA=; h=Cc:Date:From:Reply-To:Subject:To; b=tGf5BKLNRDhgfmGm+laeLIpYIB40/7UQrgooMJk9OT1CigZ8J50kHAgsbvFoksj9wfh OtT8rYEDAC2vJse6M8cLlrUSv85AbCXxBy4WSV4dzB87E6VTno5DbMJlvWTOhLph2w1YA LfdjxsaXw0FW1cl5D/0uSomGB9Flb4X7mjk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Entry and RetEntry might be NULL before used. Cc: Jian J Wang Cc: Hao A Wu Signed-off-by: Shenglei Zhang Reviewed-by: Hao A Wu --- MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c | 2 +- MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c b/Mde= ModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c index 8e305e4243a5..7b453fa98c2b 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCmdSymbol.c @@ -143,7 +143,7 @@ DebuggerDisplaySymbolAccrodingToAddress ( // Find the nearest symbol address // CandidateAddress =3D EbdFindSymbolAddress (Address, EdbMatchSymbolTypeNe= arestAddress, &Object, &Entry); - if (CandidateAddress =3D=3D 0 || CandidateAddress =3D=3D (UINTN) -1) { + if (CandidateAddress =3D=3D 0 || CandidateAddress =3D=3D (UINTN) -1 || E= ntry =3D=3D NULL) { EDBPrint (L"Symbole at Address not found!\n"); return EFI_DEBUG_CONTINUE; } else if (Address !=3D CandidateAddress) { diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c b/MdeMod= ulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c index 85cc275c114b..90a9b9fbd7ee 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c +++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c @@ -2062,7 +2062,7 @@ EdbPrintSource ( &RetObject, &RetEntry ); - if (SymbolAddress =3D=3D 0) { + if (SymbolAddress =3D=3D 0 || RetEntry =3D=3D NULL) { return 0 ; } =20 --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49668): https://edk2.groups.io/g/devel/message/49668 Mute This Topic: https://groups.io/mt/39808301/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 12:04:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49669+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49669+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572445639; cv=none; d=zoho.com; s=zohoarc; b=SIAyTcz8iAl/RSAh5WnFIruGGpfHLqlZceWEuON3he8HVhvM/xeZkg806SbxzJrB9Kmhu12VgLtOWUU9nLKQv4wyVWMgiO3ryd2pbY6yUQCbAnPT4wvXNYBSn0Tg8Gg8goQ9TNkJmc13CcO1cn0m2VFTrrfGwh13YUPC04Vxt74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572445639; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=BElANghmilQrbyaagRo+eOGspdYCr+ck7SU+l1/sXXI=; b=O9b+XeANZppaTevEkCENZBNUbGdNG1Z+ymStymb0S4BfFQB6jI6O02pK+pwliuWj5DBD3xYiOn9FfrRwAykbtuUvf4C/6Te6u4a7oujIwBvUyZMu5iansB0cQsYxQEmYCNpT5gI//wBwMoyiSa8ZhaaixEG9ln4nB3Qor/dvLE0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49669+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572445639902582.991486294346; Wed, 30 Oct 2019 07:27:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Wed, 30 Oct 2019 07:27:19 -0700 X-Received: from mga07.intel.com (mga07.intel.com []) by mx.groups.io with SMTP id smtpd.web11.5643.1572445636099601571 for ; Wed, 30 Oct 2019 07:27:19 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2019 07:27:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,247,1569308400"; d="scan'208";a="203895386" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 30 Oct 2019 07:27:17 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Dandan Bi , Eric Dong Subject: [edk2-devel] [PATCH v2 2/4] MdeModulePkg/HiiDatabaseDxe: Add check for StringPtr Date: Wed, 30 Oct 2019 22:27:08 +0800 Message-Id: <20191030142710.42756-3-shenglei.zhang@intel.com> In-Reply-To: <20191030142710.42756-1-shenglei.zhang@intel.com> References: <20191030142710.42756-1-shenglei.zhang@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,shenglei.zhang@intel.com X-Gm-Message-State: aaaaaaaaaaaaaaaaaaaaaaaax1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572445639; bh=uT9Kc6n4+E0UA8FG0+gZWJf6C5k/fMI5uRqcaqG0snY=; h=Cc:Date:From:Reply-To:Subject:To; b=aKaeSZwsl9Zqboh+Z8YmPEeMAU/G2oYZTnnGi7SLu7GeknknJjVSp+rC3OMTEUkWrl7 7IlS2DeOJD95y0Un55UHslDjJSwJY7WVd6Mhpwcs+r2abl7rDgXnDwmFigF/cN97vc6xz KwgKughqnX/3W/VVHc1hUdtnDnVn/+fqGOk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If the target string doesn't appear in the searched string, StringPtr will be NULL. So add a check for that. Cc: Dandan Bi Cc: Eric Dong Signed-off-by: Shenglei Zhang --- v2: Instead of returning a value, we add ASSERT to ensure StringPtr is not NULL. MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 1 + 1 file changed, 1 insertion(+) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeMod= ulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index 71ea25bc19bf..19a23fcc951e 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c @@ -909,6 +909,7 @@ CompareAndMergeDefaultString ( // To find the with AltConfigHdr in AltCfgResp, ignore other <= AltResp> which follow it. // StringPtr =3D StrStr (*AltCfgResp, AltConfigHdr); + ASSERT (StringPtr !=3D NULL);=20 StringPtrNext =3D StrStr (StringPtr + 1, L"&GUID"); if (StringPtrNext !=3D NULL) { TempCharA =3D *StringPtrNext; --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49669): https://edk2.groups.io/g/devel/message/49669 Mute This Topic: https://groups.io/mt/39808322/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 12:04:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49670+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49670+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572445641; cv=none; d=zoho.com; s=zohoarc; b=cIieyNfmm9TuwRJLqysHA9brlCF60nSW8F6FlgHD5m4RLTjpjc5BUOtmSS2zJVdiEFtu/91fzy5SQ0RKG50eEg/Y0643qv3s57kPUdRcqCsa/dxMsX1msdD6sAjVlzOz17MVIbzKmo4GkITrVnxX+lI6kQ5AhygPIPs70+TSBI8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572445641; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=V6jAA7T1yEmjpqQ+9LItvS3roNnM2gTE8HXktJiG/9w=; b=Yc3TEDmI0l6n2WLi1faUhQi4T0EOELJAbAj0G+4BVQUMSaMU3bDe7tPXsuA5OwJo2hPJlNR8c6vWctngWSQ9Gx3xSRCnPxkLKCI82buqyxBQsnvkdBPWvu5UEi9rB8D5VscDKsLejB3pWMQnjc0cpbNDs87ify3V3kYNfQ7deK8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49670+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572445641517374.3256887567221; Wed, 30 Oct 2019 07:27:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Wed, 30 Oct 2019 07:27:21 -0700 X-Received: from mga07.intel.com (mga07.intel.com []) by mx.groups.io with SMTP id smtpd.web11.5643.1572445636099601571 for ; Wed, 30 Oct 2019 07:27:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2019 07:27:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,247,1569308400"; d="scan'208";a="203895394" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 30 Oct 2019 07:27:19 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Hao A Wu , Liming Gao Subject: [edk2-devel] [PATCH v2 3/4] MdeModulePkg/EsrtDxe: Add check for EsrtRepository Date: Wed, 30 Oct 2019 22:27:09 +0800 Message-Id: <20191030142710.42756-4-shenglei.zhang@intel.com> In-Reply-To: <20191030142710.42756-1-shenglei.zhang@intel.com> References: <20191030142710.42756-1-shenglei.zhang@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,shenglei.zhang@intel.com X-Gm-Message-State: aaaaaaaaaaaaaaaaaaaaaaaax1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572445641; bh=8rHgPAqO54/3xEvrGy24SHD7H2anEcPp+ugvBAckpqk=; h=Cc:Date:From:Reply-To:Subject:To; b=drMkygv8nhX707KguRUWoiZvMosOk8F3YOj5LbCd4fE0dshXXOpjLhi2SrYp9+fZ7/k rQ8GqfDQyGPrEeMBNAlgi40n6N/t022T9OoQeO9eNkD87FDbfFtq2TTaCB87uJLXwAtwN h4AbX/sC9ONpYFf/W+CSsTm9J6NSCuWxOuc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" EsrtRepository might be NULL. So return EFI_OUT_OF_RESOURCES when it is NULL. Cc: Hao A Wu Cc: Liming Gao Signed-off-by: Shenglei Zhang Reviewed-by: Hao A Wu --- MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c b/MdeModulePkg/Unive= rsal/EsrtDxe/EsrtImpl.c index f48125382dbc..fff17b98fa3d 100644 --- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c +++ b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c @@ -239,6 +239,11 @@ DeleteEsrtEntry( goto EXIT; } =20 + if (EsrtRepository =3D=3D NULL) { + Status =3D EFI_OUT_OF_RESOURCES; + goto EXIT; + } + if ((RepositorySize % sizeof(EFI_SYSTEM_RESOURCE_ENTRY)) !=3D 0) { DEBUG((EFI_D_ERROR, "Repository Corrupt. Need to rebuild Repository.\n= ")); // @@ -332,6 +337,11 @@ UpdateEsrtEntry( &RepositorySize ); =20 + if (EsrtRepository =3D=3D NULL) { + Status =3D EFI_OUT_OF_RESOURCES; + goto EXIT; + } + if (!EFI_ERROR(Status)) { // // if exist, update Esrt cache repository --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49670): https://edk2.groups.io/g/devel/message/49670 Mute This Topic: https://groups.io/mt/39808346/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 12:04:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49671+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49671+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1572445643; cv=none; d=zoho.com; s=zohoarc; b=Xx3b9GbRlNHcPnPSjdWiDA5Z4ZJlXyYYqK09JkkZH8wEPv5ZgU0diDLcNXNP3cFeFUoqZBk9W/MZHLyzNKVAKNsCsMq2tv6HdvrIFvUn/K6CINzLrsRecnrwrAeKc8tCXWN+pYcIQQ92w2SALW4nPCZ847pYK1OIUvSg2mZRh7g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572445643; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=J6Vmy3CyDLAaNGZSetEaQgupzEvJTpr+F0bvBAOIrQk=; b=ghYDuuj4yEQhUpT2HPseu4ACWkU5mIRFtDlKLP5hRIzpIUImXFKORyhbrOXjvq1GMkZPZZKcdjvTrOs5PXItJXlhEKhPuy94OaDHxqZFqE3BllSIaJwYd4lbqFmPjYAqBC9lcAM2ziQvp1leGSJGGh9rvYWXOK790zsMtIN4lM4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49671+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572445643796657.4363050638129; Wed, 30 Oct 2019 07:27:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aaaaYY1788612xaaaaaaaaaa; Wed, 30 Oct 2019 07:27:22 -0700 X-Received: from mga07.intel.com (mga07.intel.com []) by mx.groups.io with SMTP id smtpd.web11.5643.1572445636099601571 for ; Wed, 30 Oct 2019 07:27:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2019 07:27:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,247,1569308400"; d="scan'208";a="203895436" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 30 Oct 2019 07:27:21 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu Subject: [edk2-devel] [PATCH v2 4/4] MdeModulePkg/SetupBrowserDxe: Add check for GetBufferForValue() Date: Wed, 30 Oct 2019 22:27:10 +0800 Message-Id: <20191030142710.42756-5-shenglei.zhang@intel.com> In-Reply-To: <20191030142710.42756-1-shenglei.zhang@intel.com> References: <20191030142710.42756-1-shenglei.zhang@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,shenglei.zhang@intel.com X-Gm-Message-State: aaaaaaaaaaaaaaaaaaaaaaaax1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572445642; bh=vrSj5i6bNbP8LMoN5v9zOk8t4g+R93NQsNtQmJeJRcA=; h=Cc:Date:From:Reply-To:Subject:To; b=dBT2RH/PVIjQpVKDlrz4SQwRGSUaldcxmN3p6Oj/zW7Ebg98GemDWE13Bh3g6IQUDWP sBy8XK0cdPOh+ytJvQYfafacNjOqn9Jths70TrSAwse9IWzSToSgxG6caiVH0S+0tE8gM fItSAVk3qcJ3mxgKMa3nu7gfBSb2dXKkw0k= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The returned value from GetBufferForValue might be NULL, so add a check for that before it is used. Cc: Jian J Wang Cc: Hao A Wu Signed-off-by: Shenglei Zhang --- MdeModulePkg/Universal/SetupBrowserDxe/Expression.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModul= ePkg/Universal/SetupBrowserDxe/Expression.c index 7f4929c2fcd9..984c68c6bb7a 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c @@ -1281,7 +1281,12 @@ IfrToUint ( Result->Type =3D EFI_IFR_TYPE_UNDEFINED; return EFI_SUCCESS; } + + if (GetBufferForValue (&Value) =3D=3D NULL) { + return EFI_NOT_FOUND; + }=20 Result->Value.u64 =3D *(UINT64*) GetBufferForValue (&Value); + if (Value.Type =3D=3D EFI_IFR_TYPE_BUFFER) { FreePool (Value.Buffer); } --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49671): https://edk2.groups.io/g/devel/message/49671 Mute This Topic: https://groups.io/mt/39808369/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-