From nobody Mon Apr 29 09:16:26 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+49145+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+49145+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571283076; cv=none; d=zoho.com; s=zohoarc; b=XReaOE8OKrroaSDKnEqJ2qTX50yRZz9ZDgqWxwD/JxUVoupHkVoVuLGJYWZE96bqBYIL1gLpwC5q6QGZO8cFKbSesVnGlnK6tZzF2xLrApfMczC6ABQKivpMMFcm8BV780xA37a3jlslQ7LjtZk4orGkKaymBUWCtsOFkNEa4OI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571283076; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=asyuWfPbid+Ks4Khl/p//9xK8TBnIM64dkJ4uXpQZUk=; b=GIz0nYDTOaKrlte8Eg6NQO9ZksCHrTYW0rrp5+9GI3XcF/cHbeFBeCqA7VqZsU2lq6q3Eu6Cmu2C6BkqHtcliRAPglBGbniWuy0QpwAL57iYjYyfxRILSSWdlqsejyuoYI+QGQrNXDCwPf6YrLATC8HlJDM4p11KfzQ9LDk5xvI= 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+49145+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 1571283076912185.8607987572692; Wed, 16 Oct 2019 20:31:16 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id sbWUYY1788612xKDMKdLBj9P; Wed, 16 Oct 2019 20:31:16 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1957.1571283074411166873 for ; Wed, 16 Oct 2019 20:31:15 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Oct 2019 20:31:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,306,1566889200"; d="scan'208";a="208129987" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga002.jf.intel.com with ESMTP; 16 Oct 2019 20:31:14 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu Subject: [edk2-devel] [PATCH 1/4] MdeModulePkg/EbcDebugger: Add check for Entry and RetEntry Date: Thu, 17 Oct 2019 11:31:07 +0800 Message-Id: <20191017033110.12128-2-shenglei.zhang@intel.com> In-Reply-To: <20191017033110.12128-1-shenglei.zhang@intel.com> References: <20191017033110.12128-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: f5p6AQrWyHp97h4Vg2mNyC6vx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571283076; bh=tRrPE5HpGN6Pl5Jz7QzMJ6DQFos5EgTEjsOxsRQsuuY=; h=Cc:Date:From:Reply-To:Subject:To; b=N1RNKV7Z8ec71KTtMRCl1aHOIylIioq6qEuSgvaddB5hBDMVTB/HVDhpG4xAmvjgXVu 0M7kRgG4h2+DIwKY/xdRI2Fqhhqej8zDdwTvQqJI0e13mwCRyuaH7P2CZUT70u9unxPx9 9LX0ZN/UT/LccOxbVDQGmHCh7XgOvmtd264= 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 (#49145): https://edk2.groups.io/g/devel/message/49145 Mute This Topic: https://groups.io/mt/34668863/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 Mon Apr 29 09:16:26 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+49146+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+49146+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571283078; cv=none; d=zoho.com; s=zohoarc; b=Sl1my67S7RK1ORHtmfL0Tv76nLDZlWs5cFybnn77opOf2SskJz2GBvz7yt5mjO0lFBXQAQ0v8dirtx02QMg3l4gzF1oQCUyoP9eEq9s1oFmHPL8iAOzeHh6NpkWXQuaRJ3i9bDojI/OpfwOlxgWPG+Wg/7NaajmJNqH0w5WtkLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571283078; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=mlrgRbvCNNMnowxliG9UVnwoq9fY4QSZtvqA8xxKG84=; b=VXjMRUpJM5A3RZ/5dk9uu3Z9cQPygtNPtq1M5TtDdRjAsaho9pnaHApwLJA2xqNsrk7B6yCYxB4Ws8j8liD/byoptlVUBuRShbILPLlZBiTDnrJU6167HNycPCTth8mPbDXz7k9zJ7ySMU5EDU8TibO8VwSyZXC/pMm6Xpa870E= 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+49146+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 1571283078791569.5830264041662; Wed, 16 Oct 2019 20:31:18 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 7XtgYY1788612x0jVFnmOi9z; Wed, 16 Oct 2019 20:31:17 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1957.1571283074411166873 for ; Wed, 16 Oct 2019 20:31:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Oct 2019 20:31:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,306,1566889200"; d="scan'208";a="208130005" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga002.jf.intel.com with ESMTP; 16 Oct 2019 20:31:15 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Dandan Bi , Eric Dong Subject: [edk2-devel] [PATCH 2/4] MdeModulePkg/HiiDatabaseDxe: Add check for StringPtr Date: Thu, 17 Oct 2019 11:31:08 +0800 Message-Id: <20191017033110.12128-3-shenglei.zhang@intel.com> In-Reply-To: <20191017033110.12128-1-shenglei.zhang@intel.com> References: <20191017033110.12128-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: 4tNfrXKHvnfruEPmjnb1gb90x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571283077; bh=RHIRmkqECLGDQb0WpqVqB+8HDVGY/b6qBAJJAiwRinc=; h=Cc:Date:From:Reply-To:Subject:To; b=qULD7cxGujbtuG1oG1Y6rzFinV6NU3l8TrTCBorVuEr2QXIk7gKmYug557HnQHc6Ola LEM+FuAVXyoPy7TjlW1E2GsniqG3v680z/+Ugp46h/E8ZtemoMZHhCV7mKuo5zc4MZ0fD VBUZY2WiAha9YLToXiZlIwywJGJm6KfsqEE= 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 --- MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeMod= ulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c index 71ea25bc19bf..f786da8e370a 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c @@ -909,6 +909,10 @@ CompareAndMergeDefaultString ( // To find the with AltConfigHdr in AltCfgResp, ignore other <= AltResp> which follow it. // StringPtr =3D StrStr (*AltCfgResp, AltConfigHdr); + if (StringPtr =3D=3D NULL) { + Status =3D EFI_NOT_FOUND; + goto Exit; + } 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 (#49146): https://edk2.groups.io/g/devel/message/49146 Mute This Topic: https://groups.io/mt/34668864/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 Mon Apr 29 09:16:26 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+49147+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+49147+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571283079; cv=none; d=zoho.com; s=zohoarc; b=QuIm5esjmbxYuPdBdlYNNLHzIksduhn+BdKi/J4wtGTimJBBVYAo2yiJkNibilJRqfWXRGrp7DnQGNwr7kJ3EFGLMrPicNHR3hJhbPjLFh30BewWvdX+rXtZxe/cPR/48KEuZB2y5woQd1GuxOW+nFxkUk1W8dKnI4gE7I2I+6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571283079; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=b6mk/JSpEyP3cFu8T47O036LCSQdnRUS7N5VkNbXsNI=; b=XCs1zhWWKSRZ6wof7l+xUXcodvkWg1QpKAgsYZr1kYSqkrhP25yrSCN0hZXSL59BLhYKA+w7Us7OFvGaZ9EJWDleqdQuHUDZkk5xu59ljSsLOWfWcVJItr1MLJQgnXsq0wri0bNn/hpTkiQ97fsqWVSyxLUJJg9M2WX5nQpS1ls= 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+49147+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 1571283079695384.7763139769253; Wed, 16 Oct 2019 20:31:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Vy43YY1788612xUtQvtW7JrJ; Wed, 16 Oct 2019 20:31:19 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1957.1571283074411166873 for ; Wed, 16 Oct 2019 20:31:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Oct 2019 20:31:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,306,1566889200"; d="scan'208";a="208130014" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga002.jf.intel.com with ESMTP; 16 Oct 2019 20:31:17 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Hao A Wu , Liming Gao Subject: [edk2-devel] [PATCH 3/4] MdeModulePkg/EsrtDxe: Add check for EsrtRepository Date: Thu, 17 Oct 2019 11:31:09 +0800 Message-Id: <20191017033110.12128-4-shenglei.zhang@intel.com> In-Reply-To: <20191017033110.12128-1-shenglei.zhang@intel.com> References: <20191017033110.12128-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: APTv1I4faMX8fllqu3WQ3sM9x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571283079; bh=0gU1IccD3WPqeI5bslX8CbgMW6Tddwa1wD/c2fgf4L0=; h=Cc:Date:From:Reply-To:Subject:To; b=e5nm9C/w4WrLSFxgkzt9KxYh2nwupus0Oz14h/LG97mGEsOMBRkLJYQqiuLUq6ijKVJ 45ljv91+dIfTgvsoyl3RbxiVAG6zAES7DUxfd8uoBenWpSfyOt4VIX6SC/0rNlgchE0DP O54hz6OEJUv6RVr8mJKbpJhAS644GQ18e88= 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 (#49147): https://edk2.groups.io/g/devel/message/49147 Mute This Topic: https://groups.io/mt/34668866/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 Mon Apr 29 09:16:26 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+49148+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+49148+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571283081; cv=none; d=zoho.com; s=zohoarc; b=MB3bSP4HVgHpLugHnEuvpQl9IdpE7msnfQryV64MER9/xudwj2FiLxHxaxR4WaH8qwpdSJFy2Jhz2bP2eKY4qAU28tkqV6Hn/p/Na2B/fKvlzpSQ4DpRWTosMEfiBaZLoUXlPa6Hw5R75k5frWR2EcQyOhQzPURp/c2nwQJTSCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571283081; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=7D05QBKcPfrjjuNpCdJtnNi0Eg6fr/4rdEmTwvxCMrU=; b=a5wvlSzFTLACCdQmgzK2vveLq8rZ27fAJe9gXlBo9fNa1DJgfS+Bdm+FmkiS5Hnpwsws2CCBAFUAuxyaI14ojOTHDFG8nOYbcGF+cvq41dAvRWoPA1hvR1GgxYKpWP6xOLtHYcC+mRmdaKCyyd7lRMB5nC5+JLmRAoFhzvptthI= 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+49148+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 1571283081932431.8762326530758; Wed, 16 Oct 2019 20:31:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Zk7JYY1788612x6VqwKpsPHn; Wed, 16 Oct 2019 20:31:21 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1957.1571283074411166873 for ; Wed, 16 Oct 2019 20:31:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Oct 2019 20:31:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,306,1566889200"; d="scan'208";a="208130029" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga002.jf.intel.com with ESMTP; 16 Oct 2019 20:31:19 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu Subject: [edk2-devel] [PATCH 4/4] MdeModulePkg/SetupBrowserDxe: Add check for GetBufferForValue() Date: Thu, 17 Oct 2019 11:31:10 +0800 Message-Id: <20191017033110.12128-5-shenglei.zhang@intel.com> In-Reply-To: <20191017033110.12128-1-shenglei.zhang@intel.com> References: <20191017033110.12128-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: y5OzfEzVDhTDhzEEPn5ZTAnXx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571283081; bh=3craXhdtWrK3vcVWWt/ph11HkHdkeCCgL5XJL7PhRRU=; h=Cc:Date:From:Reply-To:Subject:To; b=bGflsJqiAVQyVg3u4b9A/QmD1kBwugEB6xAjrWktQ40wss4RsopRELDefi5ezoX9syj CqhhfIDGpYBwAwfL7RYZQX0OSEH9tnMiuRCfFsFCQrt2zg8TWL6BHOft+4cctWVNBKEL2 RDJfvKIZNXiDT1AXb4vAW65JkmTe1GLtB2Y= 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; + } 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 (#49148): https://edk2.groups.io/g/devel/message/49148 Mute This Topic: https://groups.io/mt/34668867/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-