efi: Accept version 2 of memory attributes table

ardbiesheuvel · ardbiesheuvel · commit 636ab417a7ae · 2023-02-02T18:32:25.000+01:00
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: &lt;stable@vger.kernel.org&gt;
Signed-off-by: Ard Biesheuvel &lt;ardb@kernel.org&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ int __init efi_memattr_init(void)`
`33`	`33`	`return -ENOMEM;`
`34`	`34`	`}`
`35`	`35`
`36`		`- if (tbl->version > 1) {`
	`36`	`+ if (tbl->version > 2) {`
`37`	`37`	`pr_warn("Unexpected EFI Memory Attributes table version %d\n",`
`38`	`38`	`tbl->version);`
`39`	`39`	`goto unmap;`