lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gsmi: fix null-deref in gsmi_get_variable

Browse Source 
commit a769b05eeed7accc4019a1ed9799dd72067f1ce8 upstream.

We can get EFI variables without fetching the attribute, so we must
allow for that in gsmi.

commit 859748255b43 ("efi: pstore: Omit efivars caching EFI varstore
access layer") added a new get_variable call with attr=NULL, which
triggers panic in gsmi.

Fixes: 74c5b31c66 ("driver: Google EFI SMI")
Cc: stable <stable@kernel.org>
Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
Link: https://lore.kernel.org/r/20230118010212.1268474-1-khazhy@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Khazhismel Kumykov 2023-01-17 17:02:12 -08:00 committed by Greg Kroah-Hartman
parent b4461af0a5
commit ffef77794f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/firmware/google/gsmi.c
View File

@ -359,9 +359,10 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name,
memcpy(data, gsmi_dev.data_buf->start, *data_size); memcpy(data, gsmi_dev.data_buf->start, *data_size);
/* All variables are have the following attributes */ /* All variables are have the following attributes */
*attr = EFI_VARIABLE_NON_VOLATILE | if (attr)
EFI_VARIABLE_BOOTSERVICE_ACCESS | *attr = EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_RUNTIME_ACCESS; EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS;
} }
spin_unlock_irqrestore(&gsmi_dev.lock, flags); spin_unlock_irqrestore(&gsmi_dev.lock, flags);