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

Add additional checks of the kernel stack addresses in order to

Browse Source 
ensure we don't overrun the end of the call chain.

MFC after:	1 week
This commit is contained in:
Marius Strobl 2009-12-08 20:18:54 +00:00
parent 933ef0ba72
commit 259100de20
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/sparc64/sparc64/stack_machdep.c
View File

@ -36,15 +36,20 @@ __FBSDID("$FreeBSD$");
#include <machine/stack.h>
#include <machine/vmparam.h>
static void stack_capture(struct stack *st, struct frame *fp);
static void stack_capture(struct stack *st, struct frame *frame);
static void
stack_capture(struct stack *st, struct frame *fp)
stack_capture(struct stack *st, struct frame *frame)
{
struct frame *fp;
vm_offset_t callpc;
stack_zero(st);
while (1) {
fp = frame;
for (;;) {
if (!INKERNEL((vm_offset_t)fp) ||
!ALIGNED_POINTER(fp, uint64_t))
break;
callpc = fp->fr_pc;
if (!INKERNEL(callpc))
break;
@ -56,6 +61,9 @@ stack_capture(struct stack *st, struct frame *fp)
break;
if (stack_put(st, callpc) == -1)
break;
if (v9next_frame(fp) <= fp ||
v9next_frame(fp) >= frame + KSTACK_PAGES * PAGE_SIZE)
break;
fp = v9next_frame(fp);
}
}

14
sys/sun4v/sun4v/stack_machdep.c
View File

@ -36,20 +36,28 @@ __FBSDID("$FreeBSD$");
#include <machine/stack.h>
#include <machine/vmparam.h>
static void stack_capture(struct stack *st, struct frame *fp);
static void stack_capture(struct stack *st, struct frame *frame);
static void
stack_capture(struct stack *st, struct frame *fp)
stack_capture(struct stack *st, struct frame *frame)
{
struct frame *fp;
vm_offset_t callpc;
stack_zero(st);
while (1) {
fp = frame;
for (;;) {
if (!INKERNEL((vm_offset_t)fp) ||
!ALIGNED_POINTER(fp, uint64_t))
break;
callpc = fp->fr_pc;
if (!INKERNEL(callpc))
break;
if (stack_put(st, callpc) == -1)
break;
if (v9next_frame(fp) <= fp ||
v9next_frame(fp) >= frame + KSTACK_PAGES * PAGE_SIZE)
break;
fp = v9next_frame(fp);
}
}