diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2023-02-02 18:30:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-09 11:28:17 +0100 |
| commit | 661bb546c4d547afbc0fab30dd69467a95446263 (patch) | |
| tree | 42c500c7249c95f0a511ecd2e790f1ca7ee2b743 | |
| parent | ac515839b1f3e0b824af4c320a10e7cf75346507 (diff) | |
| download | linux-stable-661bb546c4d547afbc0fab30dd69467a95446263.tar.gz linux-stable-661bb546c4d547afbc0fab30dd69467a95446263.tar.bz2 linux-stable-661bb546c4d547afbc0fab30dd69467a95446263.zip | |
efi: Accept version 2 of memory attributes table
commit 636ab417a7aec4ee993916e688eb5c5977570836 upstream.
UEFI v2.10 introduces version 2 of the memory attributes table, which
turns the reserved field into a flags field, but is compatible with
version 1 in all other respects. So let's not complain about version 2
if we encounter it.
Cc: <stable@vger.kernel.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/firmware/efi/memattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/memattr.c b/drivers/firmware/efi/memattr.c index 0a9aba5f9cef..f178b2984dfb 100644 --- a/drivers/firmware/efi/memattr.c +++ b/drivers/firmware/efi/memattr.c @@ -33,7 +33,7 @@ int __init efi_memattr_init(void) return -ENOMEM; } - if (tbl->version > 1) { + if (tbl->version > 2) { pr_warn("Unexpected EFI Memory Attributes table version %d\n", tbl->version); goto unmap; |