upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stop using expressions in _Alignof()

Browse source 
_Alignof(expression) is a non-standard extension.  This is not allowed
in gnu11 and gnu17 which follow the C11 standard _Alignof(type).

Reviewed by:	arichardson, imp, jhb
Fixes:		4a9cd9fc22d7 amd64 db_trace: Reject unaligned frame pointers
Fixes:		7ccaf76a27 riscv db_trace: Ensure trapframe pointer is suitably aligned.
Fixes:		638c68897f arm64 db_trace: Ensure trapframe pointer is suitably aligned.
Differential Revision:	https://reviews.freebsd.org/D43409

(cherry picked from commit 03d04bf49492fc70366e6d78194336a4122282a2)
This commit is contained in:
Minsoo Choo 2024-01-12 15:37:53 -08:00 committed by John Baldwin
parent 1449754218
commit 3b2b83bcef
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/amd64/amd64/db_trace.c
View file

@ -206,7 +206,8 @@ db_nextframe(db_addr_t *fp, db_addr_t *ip, struct thread *td)
*/
tf_addr = *fp + 16;
if (!__is_aligned(tf_addr, _Alignof(*tf)) || !INKERNEL(tf_addr)) {
if (!__is_aligned(tf_addr, _Alignof(struct trapframe)) ||
!INKERNEL(tf_addr)) {
db_printf("--- invalid trapframe %p\n", (void *)tf_addr);
*ip = 0;
*fp = 0;

2
sys/arm64/arm64/db_trace.c
View file

@ -93,7 +93,7 @@ db_stack_trace_cmd(struct thread *td, struct unwind_state *frame)
struct trapframe *tf;
tf = (struct trapframe *)(uintptr_t)frame->fp - 1;
if (!__is_aligned(tf, _Alignof(*tf)) ||
if (!__is_aligned(tf, _Alignof(struct trapframe)) ||
!kstack_contains(td, (vm_offset_t)tf,
sizeof(*tf))) {
db_printf("--- invalid trapframe %p\n", tf);

2
sys/riscv/riscv/db_trace.c
View file

@ -84,7 +84,7 @@ db_stack_trace_cmd(struct thread *td, struct unwind_state *frame)
struct trapframe *tf;
tf = (struct trapframe *)(uintptr_t)frame->sp;
if (!__is_aligned(tf, _Alignof(*tf)) ||
if (!__is_aligned(tf, _Alignof(struct trapframe)) ||
!kstack_contains(td, (vm_offset_t)tf,
sizeof(*tf))) {
db_printf("--- invalid trapframe %p\n", tf);