From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 ACAF72097215E for ; Wed, 11 Jul 2018 17:46:05 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jul 2018 17:46:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,339,1526367600"; d="scan'208";a="74094168" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga002.jf.intel.com with ESMTP; 11 Jul 2018 17:46:03 -0700 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 11 Jul 2018 17:46:03 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 11 Jul 2018 17:46:02 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.100]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.17]) with mapi id 14.03.0319.002; Thu, 12 Jul 2018 08:46:00 +0800 From: "Fu, Siyuan" To: "Wu, Jiaxin" , "edk2-devel@lists.01.org" CC: "Ye, Ting" , "Carsey, Jaben" Thread-Topic: [Patch] ShellPkg/TftpDynamicCommand: Fix the potential assertion and memory leak issue. Thread-Index: AQHUGXl8/Bi+26knmEWqskpA5nXV8qSKwGzA Date: Thu, 12 Jul 2018 00:45:59 +0000 Message-ID: References: <20180712004410.13324-1-Jiaxin.wu@intel.com> In-Reply-To: <20180712004410.13324-1-Jiaxin.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNzg5MzE1YjUtZDI1Ni00NzZhLTg3N2QtYmZlODZhNTM2ZWFkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiUHBVY2M4RU9YOWd5cEdSOWhIcDQxTmswXC95b1lvQnNyOTZycjVRQ3U1TFZkZWM1bHpVVTdlU0tjWllaN1wvN2RHIn0= dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] ShellPkg/TftpDynamicCommand: Fix the potential assertion and memory leak issue. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2018 00:46:05 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Fu Siyuan > -----Original Message----- > From: Wu, Jiaxin > Sent: Thursday, July 12, 2018 8:44 AM > To: edk2-devel@lists.01.org > Cc: Wu, Jiaxin ; Ye, Ting ; Fu, > Siyuan ; Carsey, Jaben > Subject: [Patch] ShellPkg/TftpDynamicCommand: Fix the potential assertion > and memory leak issue. >=20 > From: Jiaxin Wu >=20 > This patch is to fix the issue reported from > https://bugzilla.tianocore.org/show_bug.cgi?id=3D925. >=20 > DataSize variable was not assigned the value if ShellOpenFileByName > returns error. > In the such a case, it should not be used to FreePages. Instead, DataSize > can be > used to record the file size once DownloadFile successfully. >=20 > Cc: Ye Ting > Cc: Fu Siyuan > Cc: Jaben Carsey > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Wu Jiaxin > --- > ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c > b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c > index e2491cd54c..44be6d4e76 100644 > --- a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c > +++ b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c > @@ -517,10 +517,12 @@ RunTftp ( > mTftpHiiHandle, RemoteFilePath, NicName, Status > ); > goto NextHandle; > } >=20 > + DataSize =3D FileSize; > + > if (!EFI_ERROR (ShellFileExists (LocalFilePath))) { > ShellDeleteFileByName (LocalFilePath); > } >=20 > Status =3D ShellOpenFileByName ( > @@ -537,11 +539,10 @@ RunTftp ( > mTftpHiiHandle, L"tftp", LocalFilePath > ); > goto NextHandle; > } >=20 > - DataSize =3D FileSize; > Status =3D ShellWriteFile (FileHandle, &FileSize, Data); > if (!EFI_ERROR (Status)) { > ShellStatus =3D SHELL_SUCCESS; > } else { > ShellPrintHiiEx ( > -- > 2.17.1.windows.2