Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak db_cpu_*. Allows backtraces on i386 to progress beyond the 

first function by not doing a NULL-deref in the debugger.

Bug located by me.  Patch implementation by riastradh@.  Hi rmind@.
This commit is contained in:
jakllsch 2014-04-12 19:01:49 +00:00
parent f45011fb30
commit ff1b98f16b
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/ddb/db_cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_cpu.c,v 1.5 2013/11/24 21:58:38 rmind Exp $ */ /* $NetBSD: db_cpu.c,v 1.6 2014/04/12 19:01:49 jakllsch Exp $ */
/*- /*-
* Copyright (c) 2009 The NetBSD Foundation, Inc. * Copyright (c) 2009 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: db_cpu.c,v 1.5 2013/11/24 21:58:38 rmind Exp $"); __KERNEL_RCSID(0, "$NetBSD: db_cpu.c,v 1.6 2014/04/12 19:01:49 jakllsch Exp $");
#ifndef _KERNEL #ifndef _KERNEL
#include <stdbool.h> #include <stdbool.h>
@ -42,23 +42,37 @@ __KERNEL_RCSID(0, "$NetBSD: db_cpu.c,v 1.5 2013/11/24 21:58:38 rmind Exp $");
#include <ddb/ddb.h> #include <ddb/ddb.h>
static struct cpu_info **cpu_info_addr; static int db_ncpu;
static struct cpu_info **db_cpu_infos;
static void
db_cpu_init(void)
{
db_expr_t addr;
db_value_of_name("ncpu", &addr);
db_read_bytes((db_addr_t)addr, sizeof(db_ncpu), (char *)&db_ncpu);
db_value_of_name("cpu_infos", &addr);
db_read_bytes((db_addr_t)addr, sizeof(db_cpu_infos),
(char *)&db_cpu_infos);
}
static struct cpu_info * static struct cpu_info *
db_cpu_index(u_int idx) db_cpu_by_index(u_int idx)
{ {
db_addr_t slot_addr = (db_addr_t)(cpu_info_addr + idx);
struct cpu_info *ci; struct cpu_info *ci;
db_read_bytes(slot_addr, sizeof(ci), (char *)&ci); db_read_bytes((db_addr_t)&db_cpu_infos[idx], sizeof(ci), (char *)&ci);
return ci; return ci;
} }
struct cpu_info * struct cpu_info *
db_cpu_first(void) db_cpu_first(void)
{ {
db_value_of_name("cpu_infos", (db_expr_t *)&cpu_info_addr);
return db_cpu_index(0); db_cpu_init();
return db_cpu_by_index(0);
} }
struct cpu_info * struct cpu_info *
@ -67,5 +81,7 @@ db_cpu_next(struct cpu_info *ci)
u_int idx; u_int idx;
db_read_bytes((db_addr_t)&ci->ci_index, sizeof(idx), (char *)&idx); db_read_bytes((db_addr_t)&ci->ci_index, sizeof(idx), (char *)&idx);
return db_cpu_index(idx + 1); if ((idx + 1) >= ncpu)
return NULL;
return db_cpu_by_index(idx + 1);
} }