From nobody Mon Feb 9 09:22:55 2026 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+47448+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+47448+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1568775999; cv=none; d=zoho.com; s=zohoarc; b=WtU4F/O8vtfqiQ3VD+A08gT3UU+BOr4j9oJRuR9wEE3GbsZptUp7BYWfvEVPO+FmaioxLZEIn27gPG22lIcp0aTYiCc9hTLYNvgvHknCvXNputHBo08i0hu4hQ4UQBm1iPQ1MpHhErZUSg1RMar3i4Y4dJqPAjimhGmdSnxfHvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568775999; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=cqiBrwW9VqHNHpgUmorvZhC6u3TdcYyfBX/+Ad4eZzg=; b=OBo1PiN/Rf3NucGE6NXNNqc0p3zA1PMyFPbcpp5Asm4eunD+VBcMiglNfFl71csVOVFfpH5LxHVpsXet28sasm7YYFJBsPfldkpIwNAsFcP4iW+XZxDLWxjpn9fb6QCncBQn6p441DBPkRQ6IHQ7cjAj8mhLEdb6gTiqTJxExoQ= 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+47448+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 1568775999740305.8131878792167; Tue, 17 Sep 2019 20:06:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id yQ20YY1788612xUaATBpbwoo; Tue, 17 Sep 2019 20:06:37 -0700 X-Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Tue, 17 Sep 2019 20:06:37 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Sep 2019 20:06:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,519,1559545200"; d="scan'208";a="338192354" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga004.jf.intel.com with ESMTP; 17 Sep 2019 20:06:35 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Ray Ni , Zhichao Gao , Laszlo Ersek Subject: [edk2-devel] [patch v2 5/5] ShellPkg: Unload image on EFI_SECURITY_VIOLATION Date: Wed, 18 Sep 2019 11:05:57 +0800 Message-Id: <20190918030557.55256-6-dandan.bi@intel.com> In-Reply-To: <20190918030557.55256-1-dandan.bi@intel.com> References: <20190918030557.55256-1-dandan.bi@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,dandan.bi@intel.com X-Gm-Message-State: vWx9g5wDGuwcswSQUaSKlz2wx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568775997; bh=gcbBijmWCUJJSkAdpvkWmGORz8OJMmVHbgPnvHEvjg8=; h=Cc:Date:From:Reply-To:Subject:To; b=umkjxsDJLwB1gpPgO9l0UGTb5Ydagj3dg6Wotn6qhVfTS4J48fSQ7Ys4RAclQw7TWf2 F4LBhy5z93HFvRZR45kwQ6AqwQOdWtFR/d8ehfbmmLFtI71+jxAF8FqG7P0ubrvUpJqVM K/6nAr6gTxgSDjaLmuXFQij+GkY5rs94Zzw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For the LoadImage() boot service, with EFI_SECURITY_VIOLATION retval, the Image was loaded and an ImageHandle was created with a valid EFI_LOADED_IMAGE_PROTOCOL, but the image can not be started right now. This follows UEFI Spec. But if the caller of LoadImage() doesn't have the option to defer the execution of an image, we can not treat EFI_SECURITY_VIOLATION like any other LoadImage() error, we should unload image for the EFI_SECURITY_VIOLATION to avoid resource leak. This patch is to do error handling for EFI_SECURITY_VIOLATION explicitly for the callers in ShellPkg which don't have the policy to defer the execution of the image. Cc: Ray Ni Cc: Zhichao Gao Cc: Laszlo Ersek REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1992 Signed-off-by: Dandan Bi Reviewed-by: Zhichao Gao Reviewed-by: Philippe Mathieu-Daude --- ShellPkg/Application/Shell/ShellManParser.c | 9 +++++++++ .../Library/UefiShellDebug1CommandsLib/LoadPciRom.c | 11 ++++++++++- ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c | 11 ++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/ShellPkg/Application/Shell/ShellManParser.c b/ShellPkg/Applica= tion/Shell/ShellManParser.c index 6909f29441..4d5a5668aa 100644 --- a/ShellPkg/Application/Shell/ShellManParser.c +++ b/ShellPkg/Application/Shell/ShellManParser.c @@ -643,10 +643,19 @@ ProcessManFile( goto Done; } DevPath =3D ShellInfoObject.NewEfiShellProtocol->GetDevicePathFromFile= Path(CmdFilePathName); Status =3D gBS->LoadImage(FALSE, gImageHandle, DevPath, NULL, 0, = &CmdFileImgHandle); if(EFI_ERROR(Status)) { + // + // With EFI_SECURITY_VIOLATION retval, the Image was loaded and an I= mageHandle was created + // with a valid EFI_LOADED_IMAGE_PROTOCOL, but the image can not be = started right now. + // If the caller doesn't have the option to defer the execution of a= n image, we should + // unload image for the EFI_SECURITY_VIOLATION to avoid the resource= leak. + // + if (Status =3D=3D EFI_SECURITY_VIOLATION) { + gBS->UnloadImage (CmdFileImgHandle); + } *HelpText =3D NULL; goto Done; } Status =3D gBS->OpenProtocol( CmdFileImgHandle, diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c b/She= llPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c index 1b169d0d3c..5b6cba17f3 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/LoadPciRom.c @@ -1,10 +1,10 @@ /** @file Main file for LoadPciRom shell Debug1 function. =20 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "UefiShellDebug1CommandsLib.h" @@ -332,10 +332,19 @@ LoadEfiDriversFromRomImage ( ImageBuffer, ImageLength, &ImageHandle ); if (EFI_ERROR (Status)) { + // + // With EFI_SECURITY_VIOLATION retval, the Image was loaded an= d an ImageHandle was created + // with a valid EFI_LOADED_IMAGE_PROTOCOL, but the image can n= ot be started right now. + // If the caller doesn't have the option to defer the executio= n of an image, we should + // unload image for the EFI_SECURITY_VIOLATION to avoid resour= ce leak. + // + if (Status =3D=3D EFI_SECURITY_VIOLATION) { + gBS->UnloadImage (ImageHandle); + } ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_LOADPCIROM_LOA= D_FAIL), gShellDebug1HiiHandle, L"loadpcirom", FileName, ImageIndex); // PrintToken (STRING_TOKEN (STR_LOADPCIROM_LOAD_IMAGE_ERROR), = HiiHandle, ImageIndex, Status); } else { Status =3D gBS->StartImage (ImageHandle, NULL, NULL); if (EFI_ERROR (Status)) { diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c b/ShellPkg/= Library/UefiShellLevel2CommandsLib/Load.c index 6a94b48c86..b6e7c952fa 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Load.c @@ -1,10 +1,10 @@ /** @file Main file for attrib shell level 2 function. =20 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 #include "UefiShellLevel2CommandsLib.h" @@ -110,10 +110,19 @@ LoadDriver( NULL, 0, &LoadedDriverHandle); =20 if (EFI_ERROR(Status)) { + // + // With EFI_SECURITY_VIOLATION retval, the Image was loaded and an Ima= geHandle was created + // with a valid EFI_LOADED_IMAGE_PROTOCOL, but the image can not be st= arted right now. + // If the caller doesn't have the option to defer the execution of an = image, we should + // unload image for the EFI_SECURITY_VIOLATION to avoid resource leak. + // + if (Status =3D=3D EFI_SECURITY_VIOLATION) { + gBS->UnloadImage (LoadedDriverHandle); + } ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_LOAD_NOT_IMAGE), gShel= lLevel2HiiHandle, FileName, Status); } else { // // Make sure it is a driver image // --=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 (#47448): https://edk2.groups.io/g/devel/message/47448 Mute This Topic: https://groups.io/mt/34184010/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-