From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.107.1.68; helo=eur02-he1-obe.outbound.protection.outlook.com; envelope-from=meenakshi.aggarwal@nxp.com; receiver=edk2-devel@lists.01.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10068.outbound.protection.outlook.com [40.107.1.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5961A21F322B0 for ; Tue, 26 Sep 2017 20:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=TjiVbowxM3S+RwpZEOH5R+DhU3HRYs7LHa1f8JLvaJY=; b=u029oGe8diWsr46u3pOCYjIWjSfF5LkWeobAH/SoG6Q1GqiU7jaHZPievPFgXYzLwl9FaUE1TR5FRRNcSlUtcRAGT3uBj2bT8H3mCNFyEYMQQZHt+JQDupFqZonjOE6Hnb4eMH8Ee4UcGgsnJLOE4V3lUp8Le8f0URQnwro7HCE= Received: from DB5PR04MB0998.eurprd04.prod.outlook.com (10.161.199.12) by AM6PR0402MB3336.eurprd04.prod.outlook.com (52.133.18.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 27 Sep 2017 03:31:19 +0000 Received: from DB5PR04MB0998.eurprd04.prod.outlook.com ([fe80::411c:6de2:e600:73c0]) by DB5PR04MB0998.eurprd04.prod.outlook.com ([fe80::411c:6de2:e600:73c0%14]) with mapi id 15.20.0077.011; Wed, 27 Sep 2017 03:31:19 +0000 From: Meenakshi Aggarwal To: "Fu, Siyuan" , "edk2-devel@lists.01.org" , "Ni, Ruiyu" , "Carsey, Jaben" , "Ye, Ting" Thread-Topic: [PATCH v2] TFTP : tftp fix for full volume case Thread-Index: AQHTNd8lw9VbuA7TWUig4/hWxNcx/KLGVNWAgAHA6zA= Date: Wed, 27 Sep 2017 03:31:18 +0000 Message-ID: References: <1506350249-28082-1-git-send-email-meenakshi.aggarwal@nxp.com> <1506351962-28200-1-git-send-email-meenakshi.aggarwal@nxp.com> In-Reply-To: Accept-Language: en-GB, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=meenakshi.aggarwal@nxp.com; x-originating-ip: [192.88.169.1] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR0402MB3336; 6:dhGioQr3P712vtfevAunvaeq68vGyLVBEOg5se3IElfQl7Ur7VwIL8tI1MSrcn4h4y1D5+kvQchPXHam3wK+yJ/8GtCilcz8x8GDfQtWHYBFMIfgFn7bokieEzIpC49cLk2R8JwJgV8k3QCLYip2WOf4eOBfDaxkWCQ+CeciGq/to+UUR7gmGKTEF449o96ce8CQv99F26EBLnOZWULMqwKEnHXo9EPghih+Z8Cd5BwgPiAuyREFb6zuiWVBJyDSxJ7DId+zw2Zph8GxQ4MIsEIcLFrNnz0xfK3UMWyb3IzXf1AgFj8GZa+Nql1e7EkeJWPq3JF3rjOjz8aqujtj4A==; 5:870+SHMMkCV3sESwzruU+wVq9EefEzRxNPjWrfDf3FJYlCjbiQSZ7zrWhkwDaE/C8Z9AawzVZdfp9mwqeVxAQQt6IcOB+jTK9Qzc0YxFquK2H38KJ/dOo0iNElk700qhny/PO1USfGJEbG1g3l6lvg==; 24:01LkiDZ1CPPgBqshT0tYYShXy9kcGRmfgrJruaqlYRnLa+CNXMVFNNytYmine/3IHw5eFIDTc1Dp6/3kLSf3sskdq9IqDb4wz1FN7HMTSlU=; 7:twLO7I1g05VOp6iMwTiZJ+3YUkZFlpEvOp4DEZAAikgI5/ygfZakidXmwd6v+t9TUrtZYr2gFMzSNCelWW4jHM9R/RZP9oZmQggKEaU0v9L0jfpeCDczRhcqzU0upKmR1AblEU7WwXbsVEDIy++cxAROFYtSwNp/T71pUaWlBFLajMom56RSA+uPmWEDXHo8kOMELPxNuF6mAMga6fpCgvthjxQy3yulfNDALFu1pKw= x-ms-exchange-antispam-srfa-diagnostics: SSOS;SSOR; x-forefront-antispam-report: SFV:SKI; SCL:-1; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(377454003)(189002)(199003)(51914003)(13464003)(229853002)(9686003)(6506006)(55016002)(68736007)(6436002)(99286003)(5660300001)(74316002)(2950100002)(7696004)(33656002)(6246003)(478600001)(53936002)(7736002)(305945005)(8936002)(4326008)(81166006)(8676002)(81156014)(76176999)(54356999)(50986999)(189998001)(101416001)(316002)(2900100001)(106356001)(25786009)(105586002)(66066001)(6116002)(102836003)(3846002)(86362001)(5250100002)(14454004)(3660700001)(97736004)(3280700002)(2906002)(110136005)(54906003)(53546010)(2501003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR0402MB3336; H:DB5PR04MB0998.eurprd04.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; x-ms-office365-filtering-correlation-id: f065f920-0c5d-4fc6-9413-08d505583795 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:AM6PR0402MB3336; x-ms-traffictypediagnostic: AM6PR0402MB3336: x-exchange-antispam-report-test: UriScan:(185117386973197)(162533806227266)(228905959029699); x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM6PR0402MB3336; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM6PR0402MB3336; x-forefront-prvs: 04433051BF received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Sep 2017 03:31:18.9978 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3336 Subject: Re: [PATCH v2] TFTP : tftp fix for full volume case X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Sep 2017 03:28:11 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Thanks for the review Siyuan. Ting, Any comment from your side? Thanks, Meenakshi > -----Original Message----- > From: Fu, Siyuan [mailto:siyuan.fu@intel.com] > Sent: Tuesday, September 26, 2017 6:12 AM > To: Meenakshi Aggarwal ; edk2- > devel@lists.01.org; Ni, Ruiyu ; Carsey, Jaben > > Cc: ard.biesheuvel@linaro.org; leif.lindholm@linaro.org; Ye, Ting > ; Udit Kumar ; Vabhav Sharma > > Subject: RE: [PATCH v2] TFTP : tftp fix for full volume case >=20 > Reviewed-by: Fu Siyuan >=20 > -----Original Message----- > From: Meenakshi Aggarwal [mailto:meenakshi.aggarwal@nxp.com] > Sent: Monday, September 25, 2017 11:06 PM > To: edk2-devel@lists.01.org; Ni, Ruiyu ; Carsey, Jabe= n > > Cc: ard.biesheuvel@linaro.org; leif.lindholm@linaro.org; Fu, Siyuan > ; Ye, Ting ; Meenakshi Aggarwal > ; Udit Kumar ; > Vabhav Sharma > Subject: [PATCH v2] TFTP : tftp fix for full volume case >=20 > Issue : > When storage media is full, tftp was resulting in ASSERT > MdeModulePkg/Core/Dxe/Mem/Page.c, because number of pages was > zero. >=20 > Reason: > While doing tftp, function call ShellWriteFile was modifying FileSize var= iable. > In case of full disk it was coming out to be Zero. >=20 > Fix: > Storage the original filesize in local variable, and use this variable wh= ile > freeing the pages. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Udit Kumar > Signed-off-by: Meenakshi Aggarwal > Signed-off-by: Vabhav Sharma > Signed-off-by: Meenakshi Aggarwal > --- > ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) >=20 > diff --git a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c > b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c > index 5c50797..fbde3bf 100755 > --- a/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c > +++ b/ShellPkg/Library/UefiShellTftpCommandLib/Tftp.c > @@ -284,6 +284,7 @@ ShellCommandRunTftp ( > EFI_HANDLE Mtftp4ChildHandle; > EFI_MTFTP4_PROTOCOL *Mtftp4; > UINTN FileSize; > + UINTN DataSize; > VOID *Data; > SHELL_FILE_HANDLE FileHandle; > UINT16 BlockSize; > @@ -294,6 +295,7 @@ ShellCommandRunTftp ( > AsciiRemoteFilePath =3D NULL; > Handles =3D NULL; > FileSize =3D 0; > + DataSize =3D 0; > BlockSize =3D MTFTP_DEFAULT_BLKSIZE; >=20 > // > @@ -537,6 +539,7 @@ ShellCommandRunTftp ( > goto NextHandle; > } >=20 > + DataSize =3D FileSize; > Status =3D ShellWriteFile (FileHandle, &FileSize, Data); > if (!EFI_ERROR (Status)) { > ShellStatus =3D SHELL_SUCCESS; > @@ -551,7 +554,7 @@ ShellCommandRunTftp ( > NextHandle: >=20 > if (Data !=3D NULL) { > - gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)Data, > EFI_SIZE_TO_PAGES (FileSize)); > + gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)Data, > + EFI_SIZE_TO_PAGES (DataSize)); > } >=20 > CloseProtocolAndDestroyServiceChild ( > -- > 1.9.1