mawei/panda-meb
1
0
Fork 0
mirror of https://github.com/infiniteCable2/panda.git synced 2026-02-18 17:23:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Flash bounds checking outside of bootstub (#1459)

Browse Source 
* add bounds checking on flash operations outside of bootstub

* fix test
This commit is contained in:
Robbe Derks
2023-06-14 15:28:49 +02:00
committed by GitHub
parent 116485443d
commit 054344de6b
6 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/drivers/logging.h
View File

@@ -1,7 +1,7 @@
#include "logging_definitions.h"
#define BANK_SIZE 0x20000U
#define BANK_SIZE LOGGING_FLASH_SECTOR_SIZE
#define BANK_LOG_CAPACITY (BANK_SIZE / sizeof(log_t))
#define TOTAL_LOG_CAPACITY (BANK_LOG_CAPACITY * 2U)

1
board/fake_stm.h
View File

@@ -56,6 +56,7 @@ uint8_t fake_logging_bank[0x40000] __attribute__ ((aligned (4)));
#define LOGGING_FLASH_BASE_B (&fake_logging_bank[0x20000])
#define LOGGING_FLASH_SECTOR_A 5
#define LOGGING_FLASH_SECTOR_B 6
#define LOGGING_FLASH_SECTOR_SIZE 0x20000U
bool flash_locked = true;
void flash_unlock(void) {

29
board/stm32fx/llflash.h
View File

@@ -12,9 +12,17 @@ void flash_lock(void) {
}
bool flash_erase_sector(uint16_t sector) {
#ifdef BOOTSTUB
// don't erase the bootloader(sector 0)
uint16_t min_sector = 1U;
uint16_t max_sector = 11U;
#else
uint16_t min_sector = LOGGING_FLASH_SECTOR_A;
uint16_t max_sector = LOGGING_FLASH_SECTOR_B;
#endif
bool ret = false;
if ((sector != 0U) && (sector < 12U) && (!flash_is_locked())) {
if ((sector >= min_sector) && (sector <= max_sector) && (!flash_is_locked())) {
FLASH->CR = (sector << 3) | FLASH_CR_SER;
FLASH->CR |= FLASH_CR_STRT;
while ((FLASH->SR & FLASH_SR_BSY) != 0U);
@@ -23,11 +31,20 @@ bool flash_erase_sector(uint16_t sector) {
return ret;
}
void flash_write_word(void *prog_ptr, uint32_t data) {
uint32_t *pp = prog_ptr;
FLASH->CR = FLASH_CR_PSIZE_1 | FLASH_CR_PG;
*pp = data;
while ((FLASH->SR & FLASH_SR_BSY) != 0U);
void flash_write_word(uint32_t *prog_ptr, uint32_t data) {
#ifndef BOOTSTUB
// don't write to any region besides the logging region
if ((prog_ptr >= (uint32_t *)LOGGING_FLASH_BASE_A) && (prog_ptr < (uint32_t *)(LOGGING_FLASH_BASE_B + LOGGING_FLASH_SECTOR_SIZE))) {
#endif
uint32_t *pp = prog_ptr;
FLASH->CR = FLASH_CR_PSIZE_1 | FLASH_CR_PG;
*pp = data;
while ((FLASH->SR & FLASH_SR_BSY) != 0U);
#ifndef BOOTSTUB
}
#endif
}
void flush_write_buffer(void) { }

1
board/stm32fx/stm32fx_config.h
View File

@@ -42,6 +42,7 @@
#define LOGGING_FLASH_SECTOR_B 11U
#define LOGGING_FLASH_BASE_A 0x080C0000U
#define LOGGING_FLASH_BASE_B 0x080E0000U
#define LOGGING_FLASH_SECTOR_SIZE 0x20000U
#include "can_definitions.h"
#include "comms_definitions.h"

31
board/stm32h7/llflash.h
View File

@@ -12,9 +12,17 @@ void flash_lock(void) {
}
bool flash_erase_sector(uint16_t sector) {
// don't erase the bootloader(sector 0)
#ifdef BOOTSTUB
// don't erase the bootloader(sector 0)
uint16_t min_sector = 1U;
uint16_t max_sector = 7U;
#else
uint16_t min_sector = LOGGING_FLASH_SECTOR_A;
uint16_t max_sector = LOGGING_FLASH_SECTOR_B;
#endif
bool ret = false;
if ((sector != 0U) && (sector < 8U) && (!flash_is_locked())) {
if ((sector >= min_sector) && (sector <= max_sector) && (!flash_is_locked())) {
FLASH->CR1 = (sector << 8) | FLASH_CR_SER;
FLASH->CR1 |= FLASH_CR_START;
while ((FLASH->SR1 & FLASH_SR_QW) != 0U);
@@ -23,11 +31,20 @@ bool flash_erase_sector(uint16_t sector) {
return ret;
}
void flash_write_word(void *prog_ptr, uint32_t data) {
uint32_t *pp = prog_ptr;
FLASH->CR1 |= FLASH_CR_PG;
*pp = data;
while ((FLASH->SR1 & FLASH_SR_QW) != 0U);
void flash_write_word(uint32_t *prog_ptr, uint32_t data) {
#ifndef BOOTSTUB
// don't write to any region besides the logging region
if ((prog_ptr >= (uint32_t *)LOGGING_FLASH_BASE_A) && (prog_ptr < (uint32_t *)(LOGGING_FLASH_BASE_B + LOGGING_FLASH_SECTOR_SIZE))) {
#endif
uint32_t *pp = prog_ptr;
FLASH->CR1 |= FLASH_CR_PG;
*pp = data;
while ((FLASH->SR1 & FLASH_SR_QW) != 0U);
#ifndef BOOTSTUB
}
#endif
}
void flush_write_buffer(void) {

1
board/stm32h7/stm32h7_config.h
View File

@@ -50,6 +50,7 @@ separate IRQs for RX and TX.
#define LOGGING_FLASH_SECTOR_B 6U
#define LOGGING_FLASH_BASE_A 0x080A0000U
#define LOGGING_FLASH_BASE_B 0x080C0000U
#define LOGGING_FLASH_SECTOR_SIZE 0x20000U
#include "can_definitions.h"
#include "comms_definitions.h"