From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D540581F03 for ; Tue, 24 Jan 2017 08:27:25 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP; 24 Jan 2017 08:27:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,278,1477983600"; d="scan'208";a="56688256" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga005.jf.intel.com with ESMTP; 24 Jan 2017 08:27:25 -0800 Received: from fmsmsx121.amr.corp.intel.com (10.18.125.36) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 24 Jan 2017 08:27:25 -0800 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.47]) by fmsmsx121.amr.corp.intel.com ([169.254.6.23]) with mapi id 14.03.0248.002; Tue, 24 Jan 2017 08:27:25 -0800 From: "Carsey, Jaben" To: "Witt, Sebastian" , "edk2-devel@lists.01.org" CC: "Carsey, Jaben" Thread-Topic: [PATCH] Fix edit on screens with more than 200 columns Thread-Index: AdJ2ODiu1mdD8bRPQUiM1SL7j7EOggACzgCQAAbPCjA= Date: Tue, 24 Jan 2017 16:27:24 +0000 Message-ID: References: <5964EF557D87964BB107B86316EE26D21E0F4BB8@DEFTHW99EK3MSX.ww902.siemens.net> In-Reply-To: <5964EF557D87964BB107B86316EE26D21E0F4BB8@DEFTHW99EK3MSX.ww902.siemens.net> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.1.200.108] MIME-Version: 1.0 Subject: Re: [PATCH] Fix edit on screens with more than 200 columns X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2017 16:27:25 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Is there a reason to not just always start with allocating the 400 and then= we don't need to complicate the end to conditionally free the buffer? > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Wi= tt, > Sebastian > Sent: Tuesday, January 24, 2017 5:14 AM > To: edk2-devel@lists.01.org > Subject: [edk2] [PATCH] Fix edit on screens with more than 200 columns > Importance: High >=20 > If the shell edit command is used on a screen with more than > 200 columns, we get a buffer overflow. This increases the default buffer = size to > 400 columns and allocates a pool when this is not enough. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Sebastian Witt >=20 > --- > .../UefiShellDebug1CommandsLib.c | 15 +++++++++= +++++- > 1 file changed, 14 insertions(+), 1 deletion(-) >=20 > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi > b.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi > b.c > index 6ebf002..d81dd01 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi > b.c > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Command > +++ sLib.c > @@ -302,12 +302,21 @@ EditorClearLine ( > IN UINTN LastRow > ) > { > - CHAR16 Line[200]; > + CHAR16 Buffer[400]; > + CHAR16 *Line =3D Buffer; >=20 > if (Row =3D=3D 0) { > Row =3D 1; > } >=20 > + // If there are more columns than our buffer can contain, allocate > + new buffer if (LastCol >=3D (sizeof (Buffer) / sizeof (CHAR16))) { > + Line =3D AllocateZeroPool (LastCol*(sizeof(CHAR16) + 1)); > + if (Line =3D=3D NULL) { > + return; > + } > + } > + > // > // prepare a blank line > // > @@ -326,6 +335,10 @@ EditorClearLine ( > // print out the blank line > // > ShellPrintEx (0, ((INT32)Row) - 1, Line); > + > + // Free if allocated > + if (Line !=3D Buffer) > + FreePool (Line); > } >=20 > /** > -- > 2.1.4 >=20 > With best regards, > Sebastian Witt >=20 > Siemens AG > Digital Factory Division > Factory Automation > Automation Products and Systems > DF FA AS DH KHE 1 > Oestliche Rheinbrueckenstr. 50 > 76187 Karlsruhe, Germany > Tel.: +49 721 595-5326 > mailto:sebastian.witt@siemens.com >=20 > www.siemens.com/ingenuityforlife >=20 > Siemens Aktiengesellschaft: Chairman of the Supervisory Board: Gerhard > Cromme; Managing Board: Joe Kaeser, Chairman, President and Chief Executi= ve > Officer; Roland Busch, Lisa Davis, Klaus Helmrich, Janina Kugel, Siegfrie= d > Russwurm, Ralf P. Thomas; Registered offices: Berlin and Munich, Germany; > Commercial registries: Berlin Charlottenburg, HRB 12300, Munich, HRB 6684= ; > WEEE-Reg.-No. DE 23691322 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel