From nobody Sat Nov 2 10:25:47 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1491798658430945.0107858077869; Sun, 9 Apr 2017 21:30:58 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1B97D21A04817; Sun, 9 Apr 2017 21:30:56 -0700 (PDT) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 42CB721A0480E for ; Sun, 9 Apr 2017 21:30:54 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP; 09 Apr 2017 21:30:53 -0700 Received: from jiaxinwu-mobl2.ccr.corp.intel.com ([10.239.196.90]) by fmsmga005.fm.intel.com with ESMTP; 09 Apr 2017 21:30:52 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,180,1488873600"; d="scan'208";a="86771466" From: Jiaxin Wu To: edk2-devel@lists.01.org Date: Mon, 10 Apr 2017 12:30:44 +0800 Message-Id: <1491798644-10212-1-git-send-email-jiaxin.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 Subject: [edk2] [Patch] NetworkPkg/TlsAuthConfigDxe: Close and free the file related resource 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: , Cc: Ye Ting , Fu Siyuan , Wu Jiaxin , Zhang Chao B MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" TlsAuthConfigDxe open file by FileExplorerLib. It need to close file handler and free file related resource in some cases. * User enrolls Cert by escape the Config page. * The Cert is not X509 type. * User chooses another file after he selected a file. Cc: Zhang Chao B Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin --- NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c | 43 +++++++++++++++++++++= +++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c b/NetworkPkg/T= lsAuthConfigDxe/TlsAuthConfigImpl.c index 81f7e7d..23442fe 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c @@ -1559,11 +1559,12 @@ TlsAuthConfigAccessCallback ( } =20 HiiGetBrowserData (&gTlsAuthConfigGuid, mTlsAuthConfigStorageName, Buffe= rSize, (UINT8 *) IfrNvData); =20 if ((Action !=3D EFI_BROWSER_ACTION_CHANGED) && - (Action !=3D EFI_BROWSER_ACTION_CHANGING)) { + (Action !=3D EFI_BROWSER_ACTION_CHANGING) &&=20 + (Action !=3D EFI_BROWSER_ACTION_FORM_CLOSE)) { Status =3D EFI_UNSUPPORTED; goto EXIT; } =20 if (Action =3D=3D EFI_BROWSER_ACTION_CHANGING) { @@ -1590,26 +1591,54 @@ TlsAuthConfigAccessCallback ( // Refresh selected file. // CleanUpPage (LabelId, Private); break; case KEY_TLS_AUTH_CONFIG_ENROLL_CERT_FROM_FILE: + // + // If the file is already opened, then close and=20 + // free the related resource first.=20 + // + if (Private->FileContext->FHandle !=3D NULL) { + CloseFile (Private->FileContext->FHandle); + Private->FileContext->FHandle =3D NULL; + if (Private->FileContext->FileName!=3D NULL){ + FreePool(Private->FileContext->FileName); + Private->FileContext->FileName =3D NULL; + } + } + =20 ChooseFile( NULL, NULL, UpdateCAFromFile, &File); break; =20 case KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT: Status =3D EnrollCertDatabase (Private, EFI_TLS_CA_CERTIFICATE_VARIA= BLE); if (EFI_ERROR (Status)) { + // + // Close File and free the related resource.=20 + // + if (Private->FileContext->FHandle !=3D NULL) { + CloseFile (Private->FileContext->FHandle); + Private->FileContext->FHandle =3D NULL; + if (Private->FileContext->FileName!=3D NULL){ + FreePool(Private->FileContext->FileName); + Private->FileContext->FileName =3D NULL; + } + } + =20 CreatePopUp ( EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"ERROR: Enroll Cert Failure!", NULL ); } break; =20 case KEY_TLS_AUTH_CONFIG_VALUE_NO_SAVE_AND_EXIT: + // + // Close File and free the related resource.=20 + // if (Private->FileContext->FHandle !=3D NULL) { CloseFile (Private->FileContext->FHandle); Private->FileContext->FHandle =3D NULL; if (Private->FileContext->FileName!=3D NULL){ FreePool(Private->FileContext->FileName); @@ -1665,10 +1694,22 @@ TlsAuthConfigAccessCallback ( *ActionRequest =3D EFI_BROWSER_ACTION_REQUEST_FORM_APPLY; break; default: break; } + } else if (Action =3D=3D EFI_BROWSER_ACTION_FORM_CLOSE) { + // + // Close File and free the related resource.=20 + // + if (Private->FileContext->FHandle !=3D NULL) { + CloseFile (Private->FileContext->FHandle); + Private->FileContext->FHandle =3D NULL; + if (Private->FileContext->FileName!=3D NULL){ + FreePool(Private->FileContext->FileName); + Private->FileContext->FileName =3D NULL; + } + } } =20 EXIT: =20 if (!EFI_ERROR (Status)) { --=20 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel