mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-28 08:02:54 +00:00
Code Issues Releases Activity

Verify that each frame pointer lies within the thread's kstack.

Browse Source 
Previously, this check was omitted for the first frame pointer.

Reported by:	pho
Reviewed by:	kib
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D16572
This commit is contained in:
Mark Johnston 2018-08-03 02:51:37 +00:00
parent f58c851d32
commit fe585be529
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=337230
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/x86/x86/stack_machdep.c
View File

@ -82,16 +82,16 @@ stack_capture(struct thread *td, struct stack *st, register_t fp)
stack_zero(st);
frame = (x86_frame_t)fp;
while (1) {
if (!INKERNEL((long)frame))
if ((vm_offset_t)frame < td->td_kstack ||
(vm_offset_t)frame >= td->td_kstack +
td->td_kstack_pages * PAGE_SIZE)
break;
callpc = frame->f_retaddr;
if (!INKERNEL(callpc))
break;
if (stack_put(st, callpc) == -1)
break;
if (frame->f_frame <= frame ||
(vm_offset_t)frame->f_frame >= td->td_kstack +
td->td_kstack_pages * PAGE_SIZE)
if (frame->f_frame <= frame)
break;
frame = frame->f_frame;
}
@ -106,7 +106,7 @@ stack_nmi_handler(struct trapframe *tf)
if (nmi_stack == NULL || curthread != nmi_pending)
return (0);
if (INKERNEL(TF_PC(tf)) && (TF_FLAGS(tf) & PSL_I) != 0)
if (!TRAPF_USERMODE(tf) && (TF_FLAGS(tf) & PSL_I) != 0)
stack_capture(curthread, nmi_stack, TF_FP(tf));
else
/* We were running in usermode or had interrupts disabled. */