summaryrefslogtreecommitdiff
path: root/drivers/firmware
diff options
context:
space:
mode:
authorKuan-Wei Chiu <visitorckw@gmail.com>2023-09-24 17:26:33 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-08 16:10:59 +0300
commit8e1a6594d78283ff4a029f03d14eb645284a45af (patch)
tree72db35bb3a75ae8d8eb418dd95b0dfa5b4eb990a /drivers/firmware
parent678edd2dfd55069062d491cb4eeff21fcb70f95e (diff)
downloadlinux-8e1a6594d78283ff4a029f03d14eb645284a45af.tar.xz
efi: fix memory leak in krealloc failure handling
[ 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>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/efi/efi.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index b43e5e6ddaf6..b7c0e8cc0764 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;
}