fix store delete_object header offset

F/724

Author: danielinux

src/pkcs11_store.c

@@ -227,7 +227,7 @@ static void check_vault(void)
 
 static void delete_object(int32_t type, uint32_t tok_id, uint32_t obj_id)
 {
-    struct obj_hdr *hdr = (struct obj_hdr *)cached_sector;
+    struct obj_hdr *hdr = (struct obj_hdr *)(cached_sector + STORE_PRIV_HDR_OFFSET);
     check_vault();
     memcpy(cached_sector, vault_base, WOLFBOOT_SECTOR_SIZE);
 

src/psa_store.c

@@ -226,7 +226,7 @@ static void check_vault(void)
 
 static void delete_object(int32_t type, uint32_t tok_id, uint32_t obj_id)
 {
-    struct obj_hdr *hdr = (struct obj_hdr *)cached_sector;
+    struct obj_hdr *hdr = (struct obj_hdr *)(cached_sector + STORE_PRIV_HDR_OFFSET);
     check_vault();
     memcpy(cached_sector, vault_base, WOLFBOOT_SECTOR_SIZE);
 

tools/unit-tests/unit-pkcs11_store.c

@@ -318,17 +318,51 @@ START_TEST(test_cross_sector_write_preserves_length)
 }
 END_TEST
 
+START_TEST(test_delete_object_ignores_metadata_prefix)
+{
+    const int32_t type = DYNAMIC_TYPE_RSA;
+    const uint32_t tok_id = VAULT_HEADER_MAGIC;
+    const uint32_t obj_id = 0x01020308U;
+    uint32_t *words;
+    uint8_t bitmap_before[BITMAP_SIZE];
+    int ret;
+
+    ret = mmap_file("/tmp/wolfboot-unit-keyvault.bin", vault_base,
+            keyvault_size, NULL);
+    ck_assert_int_eq(ret, 0);
+    memset(vault_base, 0xFF, keyvault_size);
+
+    words = (uint32_t *)vault_base;
+    words[0] = VAULT_HEADER_MAGIC;
+    words[1] = obj_id;
+    words[2] = (uint32_t)type;
+    words[3] = 0;
+    words[4] = 0;
+
+    memcpy(bitmap_before, vault_base + sizeof(uint32_t), BITMAP_SIZE);
+
+    delete_object(type, tok_id, obj_id);
+
+    ck_assert_mem_eq(vault_base + sizeof(uint32_t), bitmap_before, BITMAP_SIZE);
+    ck_assert_uint_eq(((uint32_t *)vault_base)[0], VAULT_HEADER_MAGIC);
+    ck_assert_uint_eq(((uint32_t *)vault_base)[1], obj_id);
+}
+END_TEST
+
 Suite *wolfboot_suite(void)
 {
     /* Suite initialization */
     Suite *s = suite_create("wolfBoot-pkcs11-store");
 
     TCase* tcase_store_and_load_objs = tcase_create("store_and_load_objs");
     TCase* tcase_cross_sector_write = tcase_create("cross_sector_write");
+    TCase* tcase_delete_object = tcase_create("delete_object");
     tcase_add_test(tcase_store_and_load_objs, test_store_and_load_objs);
     tcase_add_test(tcase_cross_sector_write, test_cross_sector_write_preserves_length);
+    tcase_add_test(tcase_delete_object, test_delete_object_ignores_metadata_prefix);
     suite_add_tcase(s, tcase_store_and_load_objs);
     suite_add_tcase(s, tcase_cross_sector_write);
+    suite_add_tcase(s, tcase_delete_object);
     return s;
 }
 

tools/unit-tests/unit-psa_store.c

@@ -90,13 +90,47 @@ START_TEST(test_cross_sector_write_preserves_length)
 }
 END_TEST
 
+START_TEST(test_delete_object_ignores_metadata_prefix)
+{
+    enum { type = WOLFPSA_STORE_KEY };
+    const uint32_t tok_id = VAULT_HEADER_MAGIC;
+    const uint32_t obj_id = 0x01020308U;
+    uint32_t *words;
+    uint8_t bitmap_before[BITMAP_SIZE];
+    int ret;
+
+    ret = mmap_file("/tmp/wolfboot-unit-psa-keyvault.bin", vault_base,
+        keyvault_size, NULL);
+    ck_assert_int_eq(ret, 0);
+    memset(vault_base, 0xFF, keyvault_size);
+
+    words = (uint32_t *)vault_base;
+    words[0] = VAULT_HEADER_MAGIC;
+    words[1] = obj_id;
+    words[2] = (uint32_t)type;
+    words[3] = 0;
+    words[4] = 0;
+
+    memcpy(bitmap_before, vault_base + sizeof(uint32_t), BITMAP_SIZE);
+
+    delete_object(type, tok_id, obj_id);
+
+    ck_assert_mem_eq(vault_base + sizeof(uint32_t), bitmap_before, BITMAP_SIZE);
+    ck_assert_uint_eq(((uint32_t *)vault_base)[0], VAULT_HEADER_MAGIC);
+    ck_assert_uint_eq(((uint32_t *)vault_base)[1], obj_id);
+}
+END_TEST
+
 Suite *wolfboot_suite(void)
 {
     Suite *s = suite_create("wolfBoot-psa-store");
     TCase *tcase_write = tcase_create("cross_sector_write");
+    TCase *tcase_delete = tcase_create("delete_object");
 
     tcase_add_test(tcase_write, test_cross_sector_write_preserves_length);
+    tcase_add_test(tcase_delete, test_delete_object_ignores_metadata_prefix);
     suite_add_tcase(s, tcase_write);
+    suite_add_tcase(s, tcase_delete);
     return s;
 }