public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Kuan-Wei Chiu <visitorckw@gmail.com>,
	Ard Biesheuvel <ardb@kernel.org>, Sasha Levin <sashal@kernel.org>,
	linux-efi@vger.kernel.org
Subject: [PATCH AUTOSEL 6.1 19/39] efi: fix memory leak in krealloc failure handling
Date: Sun, 29 Oct 2023 18:56:51 -0400	[thread overview]
Message-ID: <20231029225740.790936-19-sashal@kernel.org> (raw)
In-Reply-To: <20231029225740.790936-1-sashal@kernel.org>

From: Kuan-Wei Chiu <visitorckw@gmail.com>

[ Upstream commit 0d3ad1917996839a5042d18f04e41915cfa1b74a ]

In the previous code, there was a memory leak issue where the
previously allocated memory was not freed upon a failed krealloc
operation. This patch addresses the problem by releasing the old memory
before setting the pointer to NULL in case of a krealloc failure. This
ensures that memory is properly managed and avoids potential memory
leaks.

Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/firmware/efi/efi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index b43e5e6ddaf6e..b7c0e8cc0764f 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -245,9 +245,13 @@ static __init int efivar_ssdt_load(void)
 		if (status == EFI_NOT_FOUND) {
 			break;
 		} else if (status == EFI_BUFFER_TOO_SMALL) {
-			name = krealloc(name, name_size, GFP_KERNEL);
-			if (!name)
+			efi_char16_t *name_tmp =
+				krealloc(name, name_size, GFP_KERNEL);
+			if (!name_tmp) {
+				kfree(name);
 				return -ENOMEM;
+			}
+			name = name_tmp;
 			continue;
 		}
 
-- 
2.42.0


  parent reply	other threads:[~2023-10-30  0:02 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-29 22:56 [PATCH AUTOSEL 6.1 01/39] fbdev: atyfb: only use ioremap_uc() on i386 and ia64 Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 02/39] fs/ntfs3: Add ckeck in ni_update_parent() Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 03/39] fs/ntfs3: Write immediately updated ntfs state Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 04/39] fs/ntfs3: Use kvmalloc instead of kmalloc(... __GFP_NOWARN) Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 05/39] fs/ntfs3: fix deadlock in mark_as_free_ex Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 06/39] fs/ntfs3: Fix possible NULL-ptr-deref in ni_readpage_cmpr() Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 07/39] fs/ntfs3: Fix NULL pointer dereference on error in attr_allocate_frame() Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 08/39] fs/ntfs3: Fix possible null-pointer dereference in hdr_find_e() Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 09/39] fs/ntfs3: Fix directory element type detection Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 10/39] fs/ntfs3: Avoid possible memory leak Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 11/39] spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0 Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 12/39] nvme-rdma: do not try to stop unallocated queues Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 13/39] ASoC: codecs: wsa-macro: handle component name prefix Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 14/39] net: ipv6: fix return value check in esp_remove_trailer Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 15/39] net: ipv4: " Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 16/39] nfs42: client needs to strip file mode's suid/sgid bit after ALLOCATE op Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 17/39] Bluetooth: vhci: Fix race when opening vhci device Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 18/39] netfilter: nfnetlink_log: silence bogus compiler warning Sasha Levin
2023-10-29 22:56 ` Sasha Levin [this message]
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 20/39] ASoC: rt5650: fix the wrong result of key button Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 21/39] ASoC: codecs: tas2780: Fix log of failed reset via I2C Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 22/39] drm/ttm: Reorder sys manager cleanup step Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 23/39] fbdev: omapfb: fix some error codes Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 24/39] fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit() Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 25/39] fbdev: core: cfbcopyarea: fix sloppy typing Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 26/39] fbdev: core: syscopyarea: " Sasha Levin
2023-10-29 22:56 ` [PATCH AUTOSEL 6.1 27/39] scsi: mpt3sas: Fix in error path Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 28/39] drm/amdgpu: Unset context priority is now invalid Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 29/39] gpu/drm: Eliminate DRM_SCHED_PRIORITY_UNSET Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 30/39] LoongArch: Export symbol invalid_pud_table for modules building Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 31/39] LoongArch: Replace kmap_atomic() with kmap_local_page() in copy_user_highpage() Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 32/39] platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 33/39] platform/x86: asus-wmi: Only map brightness codes when using asus-wmi backlight control Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 34/39] platform/x86: asus-wmi: Map 0x2a code, Ignore 0x2b and 0x2c events Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 35/39] netfilter: nf_tables: audit log object reset once per table Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 36/39] platform/mellanox: mlxbf-tmfifo: Fix a warning message Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 37/39] nvme-pci: add BOGUS_NID for Intel 0a54 device Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 38/39] Revert "pinctrl: avoid unsafe code pattern in find_pinctrl()" Sasha Levin
2023-10-29 22:57 ` [PATCH AUTOSEL 6.1 39/39] drm/amdgpu: Reserve fences for VM update Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231029225740.790936-19-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=ardb@kernel.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=visitorckw@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox