Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Furi: Detect use-after-free #294

Draft
wants to merge 9 commits into
base: dev
Choose a base branch
from
+10 −2
Draft

Furi: Detect use-after-free #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a26631f
Furi: Detect use-after-free
Willy-JL Nov 9, 2024
f30f0c1
Furi: Fix Semaphore atomicity
Willy-JL Nov 9, 2024
213d3f1
Merge branch 'use-after-free-sentinel' into feat/use-after-free-sentinel
Willy-JL Nov 9, 2024
dbd809a
Merge remote-tracking branch 'mntm/dev' into feat/use-after-free-sent…
Willy-JL Nov 10, 2024
8f18c42
Merge remote-tracking branch 'mntm/dev' into feat/use-after-free-sent…
Willy-JL Nov 11, 2024
d03620b
Merge remote-tracking branch 'mntm/dev' into feat/use-after-free-sent…
Willy-JL Nov 21, 2024
6485d7f
Merge remote-tracking branch 'mntm/dev' into feat/use-after-free-sent…
Willy-JL Nov 27, 2024
3e6128e
Merge remote-tracking branch 'mntm/dev' into feat/use-after-free-sent…
Willy-JL Dec 10, 2024
7ec25c7
Merge remote-tracking branch 'mntm/dev' into feat/use-after-free-sent…
Willy-JL Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion furi/core/memmgr_heap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ void vPortFree(void* pv) {
/* Add this block to the list of free blocks. */
xFreeBytesRemaining += pxLink->xBlockSize;
traceFREE(pv, pxLink->xBlockSize);
memset(pv, 0, pxLink->xBlockSize - xHeapStructSize);
memset(pv, 0xDD, pxLink->xBlockSize - xHeapStructSize);
prvInsertBlockIntoFreeList((BlockLink_t*)pxLink);
}
(void)xTaskResumeAll();
Expand Down
4 changes: 4 additions & 0 deletions furi/core/semaphore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ FuriStatus furi_semaphore_release(FuriSemaphore* instance) {

stat = FuriStatusOk;

FURI_CRITICAL_ENTER();

if(FURI_IS_IRQ_MODE()) {
yield = pdFALSE;

Expand All @@ -123,6 +125,8 @@ FuriStatus furi_semaphore_release(FuriSemaphore* instance) {
furi_event_loop_link_notify(&instance->event_loop_link, FuriEventLoopEventIn);
}

FURI_CRITICAL_EXIT();

return stat;
}

Expand Down
6 changes: 5 additions & 1 deletion targets/f7/furi_hal/furi_hal_interrupt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ void MemManage_Handler(void) {
}

void BusFault_Handler(void) {
const char* crash_msg = "BusFault";

furi_log_puts("\r\n" _FURI_LOG_CLR_E "Bus fault:\r\n");
if(FURI_BIT(SCB->CFSR, SCB_CFSR_LSPERR_Pos)) {
furi_log_puts(" - lazy stacking for exception entry\r\n");
Expand Down Expand Up @@ -351,11 +353,13 @@ void BusFault_Handler(void) {

if(busfault_address == (uint32_t)NULL) {
furi_log_puts(" -- NULL pointer dereference\r\n");
} else if(busfault_address >= 0xDDDDDDDD && busfault_address <= 0xDDDEDDDD) {
crash_msg = "Possible use-after-free";
}
}
furi_log_puts(_FURI_LOG_CLR_RESET);

furi_crash("BusFault");
furi_crash(crash_msg);
}

void UsageFault_Handler(void) {
Expand Down
Loading