Source-Changes-HG archive

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

[src/trunk]: src/sys/net/npf remove bogus KASSERT, there are error paths that...



details:   https://anonhg.NetBSD.org/src/rev/c8334d781c65
branches:  trunk
changeset: 811395:c8334d781c65
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Oct 28 01:54:10 2015 +0000

description:
remove bogus KASSERT, there are error paths that don't satisfy this.
XXX: should improve error reporting to userland.

diffstat:

 sys/net/npf/npf_ctl.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r a822d4f5c930 -r c8334d781c65 sys/net/npf/npf_ctl.c
--- a/sys/net/npf/npf_ctl.c     Tue Oct 27 23:42:55 2015 +0000
+++ b/sys/net/npf/npf_ctl.c     Wed Oct 28 01:54:10 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npf_ctl.c,v 1.42 2015/06/08 01:00:43 rmind Exp $       */
+/*     $NetBSD: npf_ctl.c,v 1.43 2015/10/28 01:54:10 christos Exp $    */
 
 /*-
  * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.42 2015/06/08 01:00:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.43 2015/10/28 01:54:10 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -609,7 +609,6 @@
        /*
         * Note: destroy rulesets first, to drop references to the tableset.
         */
-       KASSERT(error == 0 || (nset || rpset || rlset || tblset));
        if (nset) {
                npf_ruleset_destroy(nset);
        }



Home | Main Index | Thread Index | Old Index