mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

Issue #18: Protect safety memory heder with CRC

Browse Source
This commit is contained in:
Mario Hüttel 2020-09-08 18:24:10 +02:00
parent b619fc5600
commit e0f61af709
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stm-firmware/include/reflow-controller/safety/safety-memory.h
View File

@ -55,7 +55,7 @@ struct safety_memory_header {
uint32_t config_overrides_len; /**< @brief Length of override entries in words */ uint32_t config_overrides_len; /**< @brief Length of override entries in words */
uint32_t err_memory_offset; /**< @brief Offset of the error memory */ uint32_t err_memory_offset; /**< @brief Offset of the error memory */
uint32_t err_memory_end; /**< @brief End of the error memory. This points to the word after the error memory, containing the CRC of the whole backup RAM. */ uint32_t err_memory_end; /**< @brief End of the error memory. This points to the word after the error memory, containing the CRC of the whole backup RAM. */
uint32_t magic_i; /**< @brief Invers Magic. Set to the bitwise inverse of @ref SAFETY_MEMORY_MAGIC */ uint32_t crc; /**< @brief CRC of the header */
}; };
struct safety_memory_boot_status { struct safety_memory_boot_status {

29
stm-firmware/safety/safety-memory.c
View File

@ -76,13 +76,21 @@ static enum safety_memory_state safety_memory_get_header(struct safety_memory_he
if (res) if (res)
return SAFETY_MEMORY_INIT_CORRUPTED; return SAFETY_MEMORY_INIT_CORRUPTED;
/* Check magics */ /* Check magic */
if (header->magic != SAFETY_MEMORY_MAGIC || header->magic_i != (uint32_t)(~SAFETY_MEMORY_MAGIC)) { if (header->magic != SAFETY_MEMORY_MAGIC) {
/* Magics invalid */ /* Magic invalid */
ret = SAFETY_MEMORY_INIT_FRESH; ret = SAFETY_MEMORY_INIT_FRESH;
goto return_val; goto return_val;
} }
/* Check the header crc */
crc_unit_reset();
crc_unit_input_array((uint32_t *)header, wordsize_of(struct safety_memory_header));
if (crc_unit_get_crc() != 0UL) {
ret = SAFETY_MEMORY_INIT_CORRUPTED;
goto return_val;
}
res = 0; res = 0;
if (header->boot_status_offset < wordsize_of(struct safety_memory_header)) if (header->boot_status_offset < wordsize_of(struct safety_memory_header))
res++; res++;
@ -106,8 +114,14 @@ return_val:
return ret; return ret;
} }
static void safety_memory_write_header(const struct safety_memory_header *header) static void safety_memory_write_and_patch_header(struct safety_memory_header *header)
{ {
/* Patch the CRC */
crc_unit_reset();
crc_unit_input_array((uint32_t *)header, wordsize_of(struct safety_memory_header) - 1U);
header->crc = crc_unit_get_crc();
/* Write to memory */
backup_ram_write_data(0UL, (uint32_t *)header, wordsize_of(*header)); backup_ram_write_data(0UL, (uint32_t *)header, wordsize_of(*header));
} }
@ -121,10 +135,9 @@ static void safety_memory_write_new_header(void)
header.err_memory_offset = header.config_overrides_offset + SAFETY_MEMORY_CONFIG_OVERRIDE_COUNT; header.err_memory_offset = header.config_overrides_offset + SAFETY_MEMORY_CONFIG_OVERRIDE_COUNT;
header.err_memory_end = header.err_memory_offset; header.err_memory_end = header.err_memory_offset;
header.magic = SAFETY_MEMORY_MAGIC; header.magic = SAFETY_MEMORY_MAGIC;
header.magic_i = ~SAFETY_MEMORY_MAGIC;
backup_ram_wipe(); backup_ram_wipe();
safety_memory_write_header(&header); safety_memory_write_and_patch_header(&header);
} }
static int safety_memory_check_crc() static int safety_memory_check_crc()
@ -399,7 +412,7 @@ int safety_memory_insert_error_entry(struct error_memory_entry *entry)
/* Still fits in memory */ /* Still fits in memory */
backup_ram_write_data(header.err_memory_end, &input_data, 1UL); backup_ram_write_data(header.err_memory_end, &input_data, 1UL);
header.err_memory_end++; header.err_memory_end++;
safety_memory_write_header(&header); safety_memory_write_and_patch_header(&header);
safety_memory_gen_crc(); safety_memory_gen_crc();
ret = 0; ret = 0;
} }
@ -435,7 +448,7 @@ int safety_memory_insert_error_entry(struct error_memory_entry *entry)
if ((addr + 1) < backup_ram_get_size_in_words()) { if ((addr + 1) < backup_ram_get_size_in_words()) {
backup_ram_write_data(addr, &input_data, 1UL); backup_ram_write_data(addr, &input_data, 1UL);
header.err_memory_end++; header.err_memory_end++;
safety_memory_write_header(&header); safety_memory_write_and_patch_header(&header);
} else { } else {
ret = -3; ret = -3;
goto return_value; goto return_value;