d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check alignment of fp in unwind_frame

Browse Source 
A misaligned frame pointer is certainly not a valid frame pointer and
with strict alignment enabled (as on CHERI) can cause panics when it is
loaded from later in the code.

This is a recommit of 40e0fa10f58d90744c2857b57adf0ddbce1a1e1c with
is_aligned() corrected to __is_aligned().

Reviewed By:	jhb
Differential Revision: https://reviews.freebsd.org/D34646
This commit is contained in:
Dapeng Gao 2022-11-16 18:29:28 +00:00 committed by Brooks Davis
parent 07853c6c9d
commit 61b146ba43
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arm64/arm64/unwind.c
View File

@ -41,7 +41,8 @@ unwind_frame(struct thread *td, struct unwind_state *frame)
fp = frame->fp;
if (!kstack_contains(td, fp, sizeof(uintptr_t) * 2))
if (!__is_aligned(fp, sizeof(fp)) ||
!kstack_contains(td, fp, sizeof(fp) * 2))
return (false);
/* FP to previous frame (X29) */

3
sys/riscv/riscv/unwind.c
View File

@ -47,7 +47,8 @@ unwind_frame(struct thread *td, struct unwind_state *frame)
fp = frame->fp;
if (!kstack_contains(td, fp - sizeof(fp) * 2, sizeof(fp) * 2))
if (!__is_aligned(fp, sizeof(fp)) ||
!kstack_contains(td, fp - sizeof(fp) * 2, sizeof(fp) * 2))
return (false);
frame->sp = fp;