summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2018-07-07 15:36:06 +0200
committerAlexander Graf <agraf@suse.de>2018-07-25 15:00:24 +0200
commit74fc044574e780c4af790b1f88dd74b317787eff (patch)
tree0d9debc3c0acbfa92fae498b67f889ddbf844029
parent55d8ee3b7bfc7222fb9782737b73364e78364792 (diff)
efi_selftest: check crc32 for InstallConfigurationTable
InstallConfigurationTable() may change the number of installed configuration tables. Check the crc32 of the system table. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--lib/efi_selftest/efi_selftest_config_table.c43
1 files changed, 43 insertions, 0 deletions
diff --git a/lib/efi_selftest/efi_selftest_config_table.c b/lib/efi_selftest/efi_selftest_config_table.c
index 627b73cdf8..2aa3fc7284 100644
--- a/lib/efi_selftest/efi_selftest_config_table.c
+++ b/lib/efi_selftest/efi_selftest_config_table.c
@@ -33,6 +33,36 @@ static void EFIAPI notify(struct efi_event *event, void *context)
}
/*
+ * Check crc32 of a table.
+ */
+static int check_table(const void *table)
+{
+ efi_status_t ret;
+ u32 crc32, res;
+ /* Casting from const to not const */
+ struct efi_table_hdr *hdr = (struct efi_table_hdr *)table;
+
+ crc32 = hdr->crc32;
+ /*
+ * Setting the crc32 of the 'const' table to zero is easier than
+ * copying
+ */
+ hdr->crc32 = 0;
+ ret = boottime->calculate_crc32(table, hdr->headersize, &res);
+ /* Reset table crc32 so it stays constant */
+ hdr->crc32 = crc32;
+ if (ret != EFI_ST_SUCCESS) {
+ efi_st_error("CalculateCrc32 failed\n");
+ return EFI_ST_FAILURE;
+ }
+ if (res != crc32) {
+ efi_st_error("Incorrect CRC32\n");
+ return EFI_ST_FAILURE;
+ }
+ return EFI_ST_SUCCESS;
+}
+
+/*
* Setup unit test.
*
* @handle: handle of the loaded image
@@ -135,6 +165,11 @@ static int execute(void)
efi_st_error("Incorrect table address\n");
return EFI_ST_FAILURE;
}
+ if (check_table(sys_table) != EFI_ST_SUCCESS) {
+ efi_st_error("Checking system table\n");
+ return EFI_ST_FAILURE;
+ }
+
/* Update table */
ret = boottime->install_configuration_table(&table_guid,
(void *)&tables[1]);
@@ -175,6 +210,10 @@ static int execute(void)
efi_st_error("Incorrect table address\n");
return EFI_ST_FAILURE;
}
+ if (check_table(sys_table) != EFI_ST_SUCCESS) {
+ efi_st_error("Checking system table\n");
+ return EFI_ST_FAILURE;
+ }
/* Delete table */
ret = boottime->install_configuration_table(&table_guid, NULL);
@@ -211,6 +250,10 @@ static int execute(void)
efi_st_error("Failed to close event\n");
return EFI_ST_FAILURE;
}
+ if (check_table(sys_table) != EFI_ST_SUCCESS) {
+ efi_st_error("Checking system table\n");
+ return EFI_ST_FAILURE;
+ }
return EFI_ST_SUCCESS;
}