openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-27 07:36:50 +00:00
Code Issues Projects Releases Wiki Activity

Do a btrace(8) favor: don't feed it with invalid instruction address.

Browse Source 
OK kettenis@
This commit is contained in:
sashan
2025-08-03 11:17:08 +00:00
parent 86b533b794
commit 85c8db77a9
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/amd64/amd64/db_trace.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: db_trace.c,v 1.59 2025/08/02 19:22:18 sashan Exp $ */
/* $OpenBSD: db_trace.c,v 1.60 2025/08/03 11:17:08 sashan Exp $ */
/* $NetBSD: db_trace.c,v 1.1 2003/04/26 18:39:27 fvdl Exp $ */
/*
@@ -319,8 +319,18 @@ stacktrace_save_utrace(struct stacktrace *st)
st->st_pc[st->st_count++] = lastframe->f_retaddr;
while (frame != NULL && st->st_count < STACKTRACE_MAX) {
if (copyin(frame, &f, sizeof(f)) != 0)
if (copyin(frame, &f, sizeof(f)) != 0) {
/*
* If the frame pointer read from the previous frame
* is invalid, assume the return address we read
* from that frame is invalid as well.
*/
if (st->st_count == 0)
st->st_pc[0] = 0;
else
st->st_count--;
break;
}
st->st_pc[st->st_count++] = f.f_retaddr;
frame = f.f_frame;
}

14
sys/arch/i386/i386/db_trace.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: db_trace.c,v 1.49 2025/08/02 19:22:18 sashan Exp $ */
/* $OpenBSD: db_trace.c,v 1.50 2025/08/03 11:17:08 sashan Exp $ */
/* $NetBSD: db_trace.c,v 1.18 1996/05/03 19:42:01 christos Exp $ */
/*
@@ -318,8 +318,18 @@ stacktrace_save_utrace(struct stacktrace *st)
st->st_pc[st->st_count++] = lastframe->f_retaddr;
while (frame != NULL && st->st_count < STACKTRACE_MAX) {
if (copyin(frame, &f, sizeof(f)) != 0)
if (copyin(frame, &f, sizeof(f)) != 0) {
/*
* If the frame pointer read from the previous frame
* is invalid, assume the return address we read
* from that frame is invalid as well.
*/
if (st->st_count == 0)
st->st_pc[0] = 0;
else
st->st_count--;
break;
}
st->st_pc[st->st_count++] = f.f_retaddr;
frame = f.f_frame;
}