arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-31 10:58:43 +00:00
Code Issues Releases Wiki Activity

core/sdcard: add out-of-bounds checks to emulator

Browse Source
This commit is contained in:
matejcik 2020-02-18 10:03:12 +01:00
parent 5523c7bbef
commit 4ed6487a19
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/embed/unix/sdcard.c
View File

@ -34,6 +34,7 @@
#endif #endif
#define SDCARD_SIZE (64 * 1024 * 1024) #define SDCARD_SIZE (64 * 1024 * 1024)
#define SDCARD_BLOCKS (SDCARD_SIZE / SDCARD_BLOCK_SIZE)
static uint8_t *sdcard_buffer = NULL; static uint8_t *sdcard_buffer = NULL;
static secbool sdcard_powered = secfalse; static secbool sdcard_powered = secfalse;
@ -103,6 +104,12 @@ secbool sdcard_read_blocks(uint32_t *dest, uint32_t block_num,
if (sectrue != sdcard_powered) { if (sectrue != sdcard_powered) {
return secfalse; return secfalse;
} }
if (block_num >= SDCARD_BLOCKS) {
return secfalse;
}
if (num_blocks > SDCARD_BLOCKS - block_num) {
return secfalse;
}
memcpy(dest, sdcard_buffer + block_num * SDCARD_BLOCK_SIZE, memcpy(dest, sdcard_buffer + block_num * SDCARD_BLOCK_SIZE,
num_blocks * SDCARD_BLOCK_SIZE); num_blocks * SDCARD_BLOCK_SIZE);
return sectrue; return sectrue;
@ -113,6 +120,12 @@ secbool sdcard_write_blocks(const uint32_t *src, uint32_t block_num,
if (sectrue != sdcard_powered) { if (sectrue != sdcard_powered) {
return secfalse; return secfalse;
} }
if (block_num >= SDCARD_BLOCKS) {
return secfalse;
}
if (num_blocks > SDCARD_BLOCKS - block_num) {
return secfalse;
}
memcpy(sdcard_buffer + block_num * SDCARD_BLOCK_SIZE, src, memcpy(sdcard_buffer + block_num * SDCARD_BLOCK_SIZE, src,
num_blocks * SDCARD_BLOCK_SIZE); num_blocks * SDCARD_BLOCK_SIZE);
return sectrue; return sectrue;