]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
efi_selftest: check crc32 for InstallConfigurationTable
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Sat, 7 Jul 2018 13:36:06 +0000 (15:36 +0200)
committerAlexander Graf <agraf@suse.de>
Wed, 25 Jul 2018 13:00:24 +0000 (15:00 +0200)
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>
lib/efi_selftest/efi_selftest_config_table.c

index 627b73cdf89ec543f54b2c24a57b32a585d0cac1..2aa3fc72847572025b3bab68a8cd17a98a9d741f 100644 (file)
@@ -32,6 +32,36 @@ static void EFIAPI notify(struct efi_event *event, void *context)
                ++*count;
 }
 
+/*
+ * 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.
  *
@@ -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;
 }