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.100; helo=mga07.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 3AF0A2205BE92 for ; Mon, 1 Jan 2018 21:22:52 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Jan 2018 21:27:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,495,1508828400"; d="scan'208";a="17388529" Received: from sfu5-mobl.ccr.corp.intel.com ([10.239.193.25]) by fmsmga004.fm.intel.com with ESMTP; 01 Jan 2018 21:27:53 -0800 From: Fu Siyuan To: edk2-devel@lists.01.org Cc: Ye Ting , Wu Jiaxin , Wang Fan Date: Tue, 2 Jan 2018 13:27:42 +0800 Message-Id: <20180102052744.9928-4-siyuan.fu@intel.com> X-Mailer: git-send-email 2.13.0.windows.1 In-Reply-To: <20180102052744.9928-1-siyuan.fu@intel.com> References: <20180102052744.9928-1-siyuan.fu@intel.com> Subject: [Patch 3/5] NetworkPkg: Fix memory leak problem in PXE driver. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jan 2018 05:22:52 -0000 Cc: Ye Ting Cc: Wu Jiaxin Cc: Wang Fan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Fu Siyuan --- NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c | 27 +++++++++++++++++++++------ NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c | 5 ++++- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c index 327b4cf1cf..7c2baa8eac 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c @@ -548,6 +548,7 @@ PxeBcExtractBootFileUrl ( if (ModeStr != NULL && *(ModeStr + AsciiStrLen (";mode=octet")) == '\0') { *ModeStr = '\0'; } else if (AsciiStrStr (BootFileNamePtr, ";mode=") != NULL) { + FreePool (TmpStr); return EFI_INVALID_PARAMETER; } @@ -1005,7 +1006,7 @@ PxeBcRequestBootService ( ); if (EFI_ERROR (Status)) { - return Status; + goto ON_ERROR; } // @@ -1020,7 +1021,7 @@ PxeBcRequestBootService ( // Status = Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData); if (EFI_ERROR (Status)) { - return Status; + goto ON_ERROR; } Status = PxeBc->UdpRead ( @@ -1041,7 +1042,7 @@ PxeBcRequestBootService ( Private->Udp6Read->Configure (Private->Udp6Read, NULL); if (EFI_ERROR (Status)) { - return Status; + goto ON_ERROR; } // @@ -1050,6 +1051,13 @@ PxeBcRequestBootService ( Reply->Length = (UINT32) ReadSize; return EFI_SUCCESS; + +ON_ERROR: + if (Discover != NULL) { + FreePool (Discover); + } + + return Status; } @@ -2158,7 +2166,7 @@ PxeBcDhcp6Discover ( (VOID *) Discover ); if (EFI_ERROR (Status)) { - return Status; + goto ON_ERROR; } // @@ -2178,7 +2186,7 @@ PxeBcDhcp6Discover ( // Status = Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData); if (EFI_ERROR (Status)) { - return Status; + goto ON_ERROR; } Status = PxeBc->UdpRead ( @@ -2198,10 +2206,17 @@ PxeBcDhcp6Discover ( // Private->Udp6Read->Configure (Private->Udp6Read, NULL); if (EFI_ERROR (Status)) { - return Status; + goto ON_ERROR; } return EFI_SUCCESS; + +ON_ERROR: + if (Discover != NULL) { + FreePool (Discover); + } + + return Status; } diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c index 09c5753ad9..8dd787be1a 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c @@ -2,7 +2,7 @@ Driver Binding functions implementationfor for UefiPxeBc Driver. (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -254,6 +254,7 @@ PxeBcDestroyIp4Children ( &Private->PxeBc, NULL ); + FreePool (Private->Ip4Nic->DevicePath); if (Private->Snp != NULL) { // @@ -414,6 +415,8 @@ PxeBcDestroyIp6Children ( &Private->PxeBc, NULL ); + FreePool (Private->Ip6Nic->DevicePath); + if (Private->Snp != NULL) { // // Close SNP from the child virtual handle -- 2.13.0.windows.1