| From f67fca3c89bedd4e002e9b89471cab6cd35dc36b Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Tue, 18 Oct 2016 15:33:18 +0100 |
| Subject: [PATCH] efi/efivar_ssdt_load: Don't return success on allocation |
| failure |
| |
| commit a75dcb5848359f488c32c0aef8711d9bd37a77b8 upstream. |
| |
| We should return -ENOMEM here, instead of success. |
| |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: linux-efi@vger.kernel.org |
| Fixes: 475fb4e8b2f4 ("efi / ACPI: load SSTDs from EFI variables") |
| Link: http://lkml.kernel.org/r/20161018143318.15673-9-matt@codeblueprint.co.uk |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c |
| index 7dd2e2d37231..5dc8dfa70a50 100644 |
| --- a/drivers/firmware/efi/efi.c |
| +++ b/drivers/firmware/efi/efi.c |
| @@ -258,8 +258,10 @@ static __init int efivar_ssdt_load(void) |
| } |
| |
| data = kmalloc(size, GFP_KERNEL); |
| - if (!data) |
| + if (!data) { |
| + ret = -ENOMEM; |
| goto free_entry; |
| + } |
| |
| ret = efivar_entry_get(entry, NULL, &size, data); |
| if (ret) { |
| -- |
| 2.10.1 |
| |
