From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw0-x231.google.com (mail-yw0-x231.google.com [IPv6:2607:f8b0:4002:c05::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5D5561A1DFF for ; Thu, 6 Oct 2016 13:07:06 -0700 (PDT) Received: by mail-yw0-x231.google.com with SMTP id t193so19931099ywc.2 for ; Thu, 06 Oct 2016 13:07:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:references:in-reply-to:mime-version:thread-index:date :message-id:subject:to; bh=uASTaQNpwlOCK4p6g4qIL88rYEM8JHhW2KaEOFrmTq4=; b=eLhzsr1cH6nqG0UhftvQvA02yszCZIkx6nGr1C/qW1VuZ3XW+xKMvCect7p+t01kfA Uigj4zHKJdgZzb+hyT2BKo7Vzb983ko1JpVc0nmwxv6em0pV1UVO1bCbN471M5buziam fChxE1JKoWZGqhnqU+GG2um9li7AblLwTOHKA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:references:in-reply-to:mime-version :thread-index:date:message-id:subject:to; bh=uASTaQNpwlOCK4p6g4qIL88rYEM8JHhW2KaEOFrmTq4=; b=SxQbQWc4U43ek1qAIJzRil7S6rOzzEmqKspd7LJROXMKAmsG976G9pb/ZGNrDGgVBU hlEJPlj9eIIohU8W0SOb0OKrC00lVNgZtcG6QFN60TC8npK8pprQLIfwTH6CIdMpHnKP zpH99+W1BFW0ZjH0lSpssZ7faAlFxPa283Vclf4yPtQH+Ro9IUwXxfEw8j7LjC1X99Rv YRqMu2LES+AQrU2QouqDL14RgfqX4XhZJ2JIDsLU7TCvsTbrYKSZYtZUjMxn9FrpNso7 hDVDEXowLuq0XRQyM3rN/hz3rqko+fTSJzZjlRg1NS/EIWEyxIqjLvCy9ZkRaZvrokVk z+9w== X-Gm-Message-State: AA6/9RlGDwlyVOcFkhvnbNXyCdpnZesZNpawOg2n5hDaymElwrhErQWfwCLSLv8kezmWysJjbvj7B9mDoJYvknqv X-Received: by 10.13.250.196 with SMTP id k187mr13814855ywf.314.1475784425016; Thu, 06 Oct 2016 13:07:05 -0700 (PDT) From: Vladimir Olovyannikov References: <1475701085-11860-1-git-send-email-tapandshah@hpe.com> <68156d3149dc5203babb1b19b2f6ef43@mail.gmail.com> In-Reply-To: MIME-Version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-Index: AQLh+uyo9Iph7/Ap8v9pRDGTJ1Y/ZwGSI08RArw4AlUBp/J7xp5Mcg/Q Date: Thu, 6 Oct 2016 13:07:03 -0700 Message-ID: To: "Shah, Tapan" , "Carsey, Jaben" , edk2-devel@lists.01.org Subject: Re: [PATCH] ShellPkg: Move UnicodeCollation2 Protcol locate out of UefiShellLib constructor 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: Thu, 06 Oct 2016 20:07:06 -0000 Content-Type: text/plain; charset=UTF-8 OK, will do -----Original Message----- From: Shah, Tapan [mailto:tapandshah@hpe.com] Sent: Thursday, October 06, 2016 1:05 PM To: Vladimir Olovyannikov; Carsey, Jaben; edk2-devel@lists.01.org Subject: RE: [edk2] [PATCH] ShellPkg: Move UnicodeCollation2 Protcol locate out of UefiShellLib constructor Can you send a patch file with this error check added @726 ? -----Original Message----- From: Vladimir Olovyannikov [mailto:vladimir.olovyannikov@broadcom.com] Sent: Thursday, October 06, 2016 2:58 PM To: Carsey, Jaben ; Shah, Tapan ; edk2-devel@lists.01.org Subject: RE: [edk2] [PATCH] ShellPkg: Move UnicodeCollation2 Protcol locate out of UefiShellLib constructor Hi Carsey, Tapan, This change breaks our platform's UEFI Shell at runtime (no asserts) : ... Press ESC in 1 seconds to skip startup.nsh or any other key to continue. Error: Image at 000B97CF000 start failed: Invalid Parameter remove-symbol-file /uefi/Build/NS2Pkg/DEBUG_GCC5/AARCH64/ShellPkg/Application/Shell/Shell/DEB UG/Shell.dll 0xB97CF000 Image Return Status = Invalid Parameter UnicodeCollation protocol is present. Attempt to open fs1:startup.nsh which is not present. There is a bug in UefiShellLib.c ShellOpenFileByName() which has nothing to do to this commit. 723 Status = gEfiShellProtocol->OpenFileByName(FileName, FileHandle, OpenMode); If there is no file available, the status is EFI_NOT_FOUND. Line 726 (or 727) of the UefiShellLib.c must be if (EFI_ERROR(Status)) { return Status; } But it is missing, and therefore EFI_SUCCESS is returned to the Shell.c from ShellFindFilePath() (line 1228 of Shell.c), which leads to an attempt to run a non-existent script which fails, and this leads to Shell unloading with "Invalid parameter". Thank you, Vladimir -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Carsey, Jaben Sent: Wednesday, October 05, 2016 3:20 PM To: Tapan Shah; edk2-devel@lists.01.org Cc: Carsey, Jaben Subject: Re: [edk2] [PATCH] ShellPkg: Move UnicodeCollation2 Protcol locate out of UefiShellLib constructor And pushed. Reviewed-by: Jaben Carsey > -----Original Message----- > From: Tapan Shah [mailto:tapandshah@hpe.com] > Sent: Wednesday, October 05, 2016 1:58 PM > To: edk2-devel@lists.01.org > Cc: Carsey, Jaben ; Tapan Shah > > Subject: [PATCH] ShellPkg: Move UnicodeCollation2 Protcol locate out > of UefiShellLib constructor > Importance: High > > Move gEfiUnicodeCollation2ProtocolGuid protocol outside of > UefiShellLib constructor function. > Locate gEfiUnicodeCollation2ProtocolGuid protocol in > ShellOpenFileByName() which > consumes this protocol API. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Tapan Shah > --- > ShellPkg/Library/UefiShellLib/UefiShellLib.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c > b/ShellPkg/Library/UefiShellLib/UefiShellLib.c > index e47d535..53f54e1 100644 > --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c > +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c > @@ -292,18 +292,12 @@ ShellLibConstructor ( > IN EFI_SYSTEM_TABLE *SystemTable > ) > { > - EFI_STATUS Status; > - > mEfiShellEnvironment2 = NULL; > gEfiShellProtocol = NULL; > gEfiShellParametersProtocol = NULL; > mEfiShellInterface = NULL; > mEfiShellEnvironment2Handle = NULL; > - > - if (mUnicodeCollationProtocol == NULL) { > - Status = gBS->LocateProtocol (&gEfiUnicodeCollation2ProtocolGuid, NULL, > (VOID**)&mUnicodeCollationProtocol); > - ASSERT_EFI_ERROR (Status); > - } > + mUnicodeCollationProtocol = NULL; > > // > // verify that auto initialize is not set false @@ -730,6 +724,14 > @@ ShellOpenFileByName( > FileHandle, > OpenMode); > > + if (mUnicodeCollationProtocol == NULL) { > + Status = gBS->LocateProtocol > + (&gEfiUnicodeCollation2ProtocolGuid, > NULL, (VOID**)&mUnicodeCollationProtocol); > + if (EFI_ERROR (Status)) { > + gEfiShellProtocol->CloseFile (*FileHandle); > + return Status; > + } > + } > + > if ((mUnicodeCollationProtocol->StriColl (mUnicodeCollationProtocol, > (CHAR16*)FileName, L"NUL") != 0) && > (mUnicodeCollationProtocol->StriColl (mUnicodeCollationProtocol, > (CHAR16*)FileName, L"NULL") != 0) && > !EFI_ERROR(Status) && ((OpenMode & EFI_FILE_MODE_CREATE) != 0)){ > -- > 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel