Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/usermode/target/i386 Add extra kasserts to make sur...



details:   https://anonhg.NetBSD.org/src/rev/aabe950d3560
branches:  trunk
changeset: 772932:aabe950d3560
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Sat Jan 21 22:05:06 2012 +0000

description:
Add extra kasserts to make sure we dont derive paramters from zero ucp's

diffstat:

 sys/arch/usermode/target/i386/cpu_i386.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (58 lines):

diff -r ba522e4726d5 -r aabe950d3560 sys/arch/usermode/target/i386/cpu_i386.c
--- a/sys/arch/usermode/target/i386/cpu_i386.c  Sat Jan 21 21:50:24 2012 +0000
+++ b/sys/arch/usermode/target/i386/cpu_i386.c  Sat Jan 21 22:05:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_i386.c,v 1.2 2012/01/14 17:42:52 reinoud Exp $ */
+/* $NetBSD: cpu_i386.c,v 1.3 2012/01/21 22:05:06 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud%netbsd.org@localhost>
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_i386.c,v 1.2 2012/01/14 17:42:52 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_i386.c,v 1.3 2012/01/21 22:05:06 reinoud Exp $");
 
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -268,6 +268,7 @@
 register_t
 md_get_pc(ucontext_t *ucp)
 {
+       KASSERT(ucp);
        register_t *reg = (register_t *) &ucp->uc_mcontext;
 
        return reg[14];                 /* EIP */
@@ -276,6 +277,7 @@
 register_t
 md_get_sp(ucontext_t *ucp)
 {
+       KASSERT(ucp);
        register_t *reg = (register_t *) &ucp->uc_mcontext;
 
        return reg[17];                 /* ESP */
@@ -303,6 +305,7 @@
 void
 md_syscall_get_opcode(ucontext_t *ucp, uint32_t *opcode)
 {
+       KASSERT(ucp);
        register_t *reg = (register_t *) &ucp->uc_mcontext;
 //     uint8_t  *p8  = (uint8_t *) (reg[14]);
        uint16_t *p16 = (uint16_t*) (reg[14]);  /* EIP */
@@ -323,6 +326,7 @@
 void
 md_syscall_inc_pc(ucontext_t *ucp, uint32_t opcode)
 {
+       KASSERT(ucp);
        uint *reg = (int *) &ucp->uc_mcontext;
 
        /* advance program counter */
@@ -343,6 +347,7 @@
 void
 md_syscall_dec_pc(ucontext_t *ucp, uint32_t opcode)
 {
+       KASSERT(ucp);
        uint *reg = (int *) &ucp->uc_mcontext;
 
        switch (opcode) {



Home | Main Index | Thread Index | Old Index