From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id E8FCA7803D0 for ; Wed, 29 May 2024 08:55:55 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=M1e2DMrhlp+y0BVIiy7cZJ9zfGtvW8KIIvJ/AXLtp/8=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1716972955; v=1; b=fbhEiRQm87tv2YoZtUGCGrxhnDtAKpV9u+M5YhbNFG3O089RqGC3YxTSDnR/5X4cOKj3TPgg nfSvpWnlq1OBLWYzusLtKgXCUSN0vw1Auj8lBO2sYbmnkCT1v6FAUt+cqymgF7nxqIW6R9ucuid 1RTHVJai6rean5OPWx1bHKt/MMSgMhUmDNf+Sfni5UuIHnirQhxzG/d9xMQ7wnvo7t9/0T+2QbG JcGiwzIEcH/VbFDUz1imrSWqYOkztZ8kbICjhcrTvcKfVtZoexF0wJuefYPFlhnlV1BY/QNwOa1 42qOWJA303BYIiBtw4DJufLXIJqxVWJJXjbJu4aoOTUTQ== X-Received: by 127.0.0.2 with SMTP id hI1iYY7687511xT1peoIw6e4; Wed, 29 May 2024 01:55:54 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9182.1716972951321108699 for ; Wed, 29 May 2024 01:55:51 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 43F422F4; Wed, 29 May 2024 01:56:15 -0700 (PDT) X-Received: from usa.arm.com (a077434.arm.com [10.162.46.143]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5F4ED3F762; Wed, 29 May 2024 01:55:49 -0700 (PDT) From: "Sahil Kaushal" To: devel@edk2.groups.io Cc: Ard Biesheuvel , =?UTF-8?q?Leif=20Lindholm=20=C2=A0?= , Sami Mujawar , =?UTF-8?q?sahil=20=C2=A0?= Subject: [edk2-devel] [edk2-platforms][PATCH V4 11/17] Platform/ARM/NorFlashDxe: Fix memory leak in NorFlashCreateInstance() Date: Wed, 29 May 2024 14:25:11 +0530 Message-Id: <20240529085517.1074417-12-Sahil.Kaushal@arm.com> In-Reply-To: <20240529085517.1074417-1-Sahil.Kaushal@arm.com> References: <20240529085517.1074417-1-Sahil.Kaushal@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Wed, 29 May 2024 01:55:51 -0700 Resent-From: sahil.kaushal@arm.com Reply-To: devel@edk2.groups.io,sahil.kaushal@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ujcfW9m5keru3aEzI0GiHbFAx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=fbhEiRQm; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: sahil This patch adds error_handler1 and error_handler2 labels in NorFlashCreateInstance() function to handle the cleanup. error_handler1: Frees just the Instance structure as the ShadowBuffer is not allocated yet. error_handler2: Frees both Instance and Instance->ShadowBuffer. Signed-off-by: sahil --- Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.c | 16 +++++++++++= ----- Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.c | 17 +++++++++++= +----- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.c b/Platform/AR= M/Drivers/NorFlashDxe/NorFlashDxe.c index e01b05d91978..ebe985bdf02b 100644 --- a/Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.c +++ b/Platform/ARM/Drivers/NorFlashDxe/NorFlashDxe.c @@ -135,7 +135,8 @@ NorFlashCreateInstance ( =20 Instance->ShadowBuffer =3D AllocateRuntimePool (BlockSize); if (Instance->ShadowBuffer =3D=3D NULL) { - return EFI_OUT_OF_RESOURCES; + Status =3D EFI_OUT_OF_RESOURCES; + goto error_handler1; } =20 if (SupportFvb) { @@ -152,8 +153,7 @@ NorFlashCreateInstance ( NULL ); if (EFI_ERROR (Status)) { - FreePool (Instance); - return Status; + goto error_handler2; } } else { Status =3D gBS->InstallMultipleProtocolInterfaces ( @@ -167,13 +167,19 @@ NorFlashCreateInstance ( NULL ); if (EFI_ERROR (Status)) { - FreePool (Instance); - return Status; + goto error_handler2; } } =20 *NorFlashInstance =3D Instance; return Status; + +error_handler2: + FreePool (Instance->ShadowBuffer); + +error_handler1: + FreePool (Instance); + return Status; } =20 EFI_STATUS diff --git a/Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.c b/Pl= atform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.c index 16fe3762e125..6bfbf58f6907 100644 --- a/Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.c +++ b/Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.c @@ -129,7 +129,8 @@ NorFlashCreateInstance ( =20 Instance->ShadowBuffer =3D AllocateRuntimePool (BlockSize); if (Instance->ShadowBuffer =3D=3D NULL) { - return EFI_OUT_OF_RESOURCES; + Status =3D EFI_OUT_OF_RESOURCES; + goto error_handler1; } =20 if (SupportFvb) { @@ -142,17 +143,23 @@ NorFlashCreateInstance ( &Instance->FvbProtocol ); if (EFI_ERROR (Status)) { - FreePool (Instance); - return Status; + goto error_handler2; } } else { DEBUG ((DEBUG_ERROR, "standalone MM NOR Flash driver only support FV= B.\n")); - FreePool (Instance); - return EFI_UNSUPPORTED; + Status =3D EFI_UNSUPPORTED; + goto error_handler2; } =20 *NorFlashInstance =3D Instance; return Status; + +error_handler2: + FreePool (Instance->ShadowBuffer); + +error_handler1: + FreePool (Instance); + return Status; } =20 EFI_STATUS --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119326): https://edk2.groups.io/g/devel/message/119326 Mute This Topic: https://groups.io/mt/106365462/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-