summaryrefslogtreecommitdiff
path: root/drivers/firmware/efi/efi.c
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2023-10-20 18:11:06 +0200
committerArd Biesheuvel <ardb@kernel.org>2023-10-20 18:11:06 +0200
commitc03d21f05e76b25f907684bdf874308dcefab385 (patch)
tree329af17330383296b4d68102ac6a474da480571f /drivers/firmware/efi/efi.c
parent8dbe33956d96c9d066ef15ca933ede30748198b2 (diff)
parent50e782a86c980d4f8292ef82ed8139282ca07a98 (diff)
Merge 3rd batch of EFI fixes into efi/urgent
Diffstat (limited to 'drivers/firmware/efi/efi.c')
-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 ce20a60676f0..1974f0ad32ba 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -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;
}