Source-Changes-HG archive

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

[src/trunk]: src/sys/uvm This KASSERT can trigger a panic too easily, if SCAR...



details:   https://anonhg.NetBSD.org/src/rev/0160a3004f18
branches:  trunk
changeset: 330192:0160a3004f18
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Jun 28 15:52:45 2014 +0000

description:
This KASSERT can trigger a panic too easily, if SCARG(uap, cmd)=SWAP_OFF and
SCARG(uap, arg)=NULL. The same KASSERT is already in the SWAP_ON switch case,
so just delete it here.

diffstat:

 sys/uvm/uvm_swap.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 344c06c99919 -r 0160a3004f18 sys/uvm/uvm_swap.c
--- a/sys/uvm/uvm_swap.c        Sat Jun 28 11:39:15 2014 +0000
+++ b/sys/uvm/uvm_swap.c        Sat Jun 28 15:52:45 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_swap.c,v 1.169 2014/06/22 19:09:39 maxv Exp $      */
+/*     $NetBSD: uvm_swap.c,v 1.170 2014/06/28 15:52:45 maxv Exp $      */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.169 2014/06/22 19:09:39 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.170 2014/06/28 15:52:45 maxv Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_compat_netbsd.h"
@@ -565,7 +565,6 @@
                if (SCARG(uap, cmd) == SWAP_ON &&
                    copystr("miniroot", userpath, SWAP_PATH_MAX, &len))
                        panic("swapctl: miniroot copy failed");
-               KASSERT(len > 0);
        } else {
                struct pathbuf *pb;
 



Home | Main Index | Thread Index | Old Index