Skip to contentSkip to conversation

efi: fix memory leak in krealloc failure handling

PATCH In review Kuan-Wei Chiu 2 participants 2 messages Sep 24, 2023 – Oct 13, 2023 EFI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 efi: fix memory leak in krealloc failure handling

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.

---
 drivers/firmware/efi/efi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/firmware/efi/efi.c +6 -2
index ce20a60676f0..1974f0ad32ba 100644
@@ -273,9 +273,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;
 		}
 
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 8 lines · Kuan-Wei Chiu

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.

Quoted 5 lines
---
 drivers/firmware/efi/efi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Queued as a fix

Thanks,

Quoted 23 lines
drivers/firmware/efi/efi.c +6 -3
index ce20a60676f0..1974f0ad32ba 100644
@@ -273,9 +273,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.25.1