Module Name: src
Committed By: matt
Date: Fri Sep 14 03:58:47 UTC 2012
Modified Files:
src/sys/arch/arm/arm: db_trace.c
Log Message:
Only fetch savecode if scp is word aligned (prevents recursive ddb faults).
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/arm/db_trace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/db_trace.c
diff -u src/sys/arch/arm/arm/db_trace.c:1.24 src/sys/arch/arm/arm/db_trace.c:1.25
--- src/sys/arch/arm/arm/db_trace.c:1.24 Fri Feb 17 16:26:51 2012
+++ src/sys/arch/arm/arm/db_trace.c Fri Sep 14 03:58:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.24 2012/02/17 16:26:51 christos Exp $ */
+/* $NetBSD: db_trace.c,v 1.25 2012/09/14 03:58:47 matt Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.24 2012/02/17 16:26:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.25 2012/09/14 03:58:47 matt Exp $");
#include <sys/proc.h>
#include <arm/armreg.h>
@@ -193,7 +193,11 @@ db_stack_trace_print(db_expr_t addr, boo
db_read_bytes((db_addr_t)((u_int32_t *)scp + scp_offset),
sizeof(savecode), (void *)&savecode);
#else
- savecode = ((u_int32_t *)scp)[scp_offset];
+ if ((scp & 3) == 0) {
+ savecode = ((u_int32_t *)scp)[scp_offset];
+ } else {
+ savecode = 0;
+ }
#endif
if ((savecode & 0x0e100000) == 0x08000000) {
/* Looks like an STM */
