From nobody Wed May 8 11:31: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+48865+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+48865+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1570866709; cv=none; d=zoho.com; s=zohoarc; b=HI5sHlEOOFh75KIM8w4JC3pBjAKVEK9tveNR/2bhlfh07MHk3GJ/pmNspHSfOB+5TynS1qMsA2E0C6D1tSCJY8gKQNyDqiavvPVdrDqQw/Acx8lFZcPgAdJ1DBQtLlGT5y88YXXpXgqjuk1P0XYsZBc86tYOMrPiCRJ5jsZUXN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570866709; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=X5g1sxq66PIQKIVv68ImTdJE6/rNzFJR2D0NZZxOnH0=; b=G7Fiayd9OqGhQZ6AJLiu9eJVa8KpetRvrTjFa/M+kWlwNHOd04QPcieMddeAC2YaNanAN3AuhT6BgqyXdxelbTfRQtt5juwtr0q+5mQo/UHEmNqzvkTMt0c86Kg38z/U9P0NnoVPGKmIjFOQKx4F8cL5W3utuSZ6VwHTA5PFSdg= 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+48865+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 1570866709799668.3786251055116; Sat, 12 Oct 2019 00:51:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0QroYY1788612x73z2yz5h8X; Sat, 12 Oct 2019 00:51:48 -0700 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.2774.1570866708542145634 for ; Sat, 12 Oct 2019 00:51:48 -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 fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Oct 2019 00:51:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,286,1566889200"; d="scan'208";a="198926904" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 12 Oct 2019 00:51:46 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH] ShellPkg/Shell/FileHandleWrappers.c: Add check for MemFile->Buffer Date: Sat, 12 Oct 2019 15:51:15 +0800 Message-Id: <20191012075115.10972-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: w5PXUCD9iYOPpgRIMufFbeKkx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1570866708; bh=MOHPcgxUhGFYF974BsWdPJfMTGX2+TCq4JLjNfXnKFo=; h=Cc:Date:From:Reply-To:Subject:To; b=wXRMLqy3SKEZxTYWPU5FdgzzTuC0TGEgdAm2bV8fiLkH6+9fJ2LVcWTW7elYu9gn9IQ +BSHVbcLP+oOUfDROFGQHUQkbbk8OHcbpp1EjLWTeuE4paS9DY2cYI3HSxJnoL/M5WwTQ p4bTPKrTJKtYEWQj7mE1lgEvq6AhndS7XsI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add check for MemFile->Buffer. Return EFI_OUT_OF_RESOURCES if MemFile->Buffer is NULL. Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Shenglei Zhang --- ShellPkg/Application/Shell/FileHandleWrappers.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.c b/ShellPkg/App= lication/Shell/FileHandleWrappers.c index 587556c42495..673031c9c73a 100644 --- a/ShellPkg/Application/Shell/FileHandleWrappers.c +++ b/ShellPkg/Application/Shell/FileHandleWrappers.c @@ -1644,7 +1644,10 @@ FileInterfaceMemWrite( // if ((UINTN)(MemFile->Position + (*BufferSize)) > (UINTN)(MemFile->Buff= erSize)) { MemFile->Buffer =3D ReallocatePool((UINTN)(MemFile->BufferSize), (UI= NTN)(MemFile->BufferSize) + (*BufferSize) + MEM_WRITE_REALLOC_OVERHEAD, Mem= File->Buffer); - MemFile->BufferSize +=3D (*BufferSize) + MEM_WRITE_REALLOC_OVERHEAD; + if (MemFile->Buffer =3D=3D NULL){ + return EFI_OUT_OF_RESOURCES; + } + MemFile->BufferSize +=3D (*BufferSize) + MEM_WRITE_REALLOC_OVERHEAD; } CopyMem(((UINT8*)MemFile->Buffer) + MemFile->Position, Buffer, *Buffer= Size); MemFile->Position +=3D (*BufferSize); @@ -1661,6 +1664,9 @@ FileInterfaceMemWrite( AsciiSPrint(AsciiBuffer, *BufferSize, "%S", Buffer); if ((UINTN)(MemFile->Position + AsciiStrSize(AsciiBuffer)) > (UINTN)(M= emFile->BufferSize)) { MemFile->Buffer =3D ReallocatePool((UINTN)(MemFile->BufferSize), (UI= NTN)(MemFile->BufferSize) + AsciiStrSize(AsciiBuffer) + MEM_WRITE_REALLOC_O= VERHEAD, MemFile->Buffer); + if (MemFile->Buffer =3D=3D NULL){ + return EFI_OUT_OF_RESOURCES; + } MemFile->BufferSize +=3D AsciiStrSize(AsciiBuffer) + MEM_WRITE_REALL= OC_OVERHEAD; } CopyMem(((UINT8*)MemFile->Buffer) + MemFile->Position, AsciiBuffer, As= ciiStrSize(AsciiBuffer)); --=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 (#48865): https://edk2.groups.io/g/devel/message/48865 Mute This Topic: https://groups.io/mt/34508892/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-