| From 41ab3acec6829d0d1fc684ad69303f460abdd769 Mon Sep 17 00:00:00 2001 |
| From: Gary Lin <glin@suse.com> |
| Date: Thu, 9 Apr 2020 15:04:33 +0200 |
| Subject: [PATCH] efi/x86: Fix the deletion of variables in mixed mode |
| |
| commit a4b81ccfd4caba017d2b84720b6de4edd16911a0 upstream. |
| |
| efi_thunk_set_variable() treated the NULL "data" pointer as an invalid |
| parameter, and this broke the deletion of variables in mixed mode. |
| This commit fixes the check of data so that the userspace program can |
| delete a variable in mixed mode. |
| |
| Fixes: 8319e9d5ad98ffcc ("efi/x86: Handle by-ref arguments covering multiple pages in mixed mode") |
| Signed-off-by: Gary Lin <glin@suse.com> |
| Signed-off-by: Ard Biesheuvel <ardb@kernel.org> |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Link: https://lore.kernel.org/r/20200408081606.1504-1-glin@suse.com |
| Link: https://lore.kernel.org/r/20200409130434.6736-9-ardb@kernel.org |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c |
| index 32ba7d2d9ce1..e664e75b311a 100644 |
| --- a/arch/x86/platform/efi/efi_64.c |
| +++ b/arch/x86/platform/efi/efi_64.c |
| @@ -835,7 +835,7 @@ efi_thunk_set_variable(efi_char16_t *name, efi_guid_t *vendor, |
| phys_vendor = virt_to_phys_or_null(vnd); |
| phys_data = virt_to_phys_or_null_size(data, data_size); |
| |
| - if (!phys_name || !phys_data) |
| + if (!phys_name || (data && !phys_data)) |
| status = EFI_INVALID_PARAMETER; |
| else |
| status = efi_thunk(set_variable, phys_name, phys_vendor, |
| @@ -866,7 +866,7 @@ efi_thunk_set_variable_nonblocking(efi_char16_t *name, efi_guid_t *vendor, |
| phys_vendor = virt_to_phys_or_null(vnd); |
| phys_data = virt_to_phys_or_null_size(data, data_size); |
| |
| - if (!phys_name || !phys_data) |
| + if (!phys_name || (data && !phys_data)) |
| status = EFI_INVALID_PARAMETER; |
| else |
| status = efi_thunk(set_variable, phys_name, phys_vendor, |
| -- |
| 2.7.4 |
| |
