From owner-svn-src-all@FreeBSD.ORG  Thu Feb 25 09:51:15 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 398E71065670;
	Thu, 25 Feb 2010 09:51:15 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 29DCF8FC14;
	Thu, 25 Feb 2010 09:51:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1P9pFDS074119;
	Thu, 25 Feb 2010 09:51:15 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1P9pF1P074118;
	Thu, 25 Feb 2010 09:51:15 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201002250951.o1P9pF1P074118@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 25 Feb 2010 09:51:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204303 - head/sys/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Feb 2010 09:51:15 -0000

Author: rwatson
Date: Thu Feb 25 09:51:14 2010
New Revision: 204303
URL: http://svn.freebsd.org/changeset/base/204303

Log:
  Fix edge cases in several KASSERTs: use <= rather than < when testing that
  counters have not gone about MAXCPU or NETISR_MAXPROT.  These problems
  caused panics on UP kernels with INVARIANTS when using sysctl -a, but
  would also have caused problems for 32-core boxes or if the netisr
  protocol vector was fully populated.
  
  Reported by:	nwhitehorn, Neel Natu <neelnatu@gmail.com>
  MFC after:	4 days

Modified:
  head/sys/net/netisr.c

Modified: head/sys/net/netisr.c
==============================================================================
--- head/sys/net/netisr.c	Thu Feb 25 06:53:46 2010	(r204302)
+++ head/sys/net/netisr.c	Thu Feb 25 09:51:14 2010	(r204303)
@@ -1167,7 +1167,7 @@ sysctl_netisr_proto(SYSCTL_HANDLER_ARGS)
 		counter++;
 	}
 	NETISR_RUNLOCK(&tracker);
-	KASSERT(counter < NETISR_MAXPROT,
+	KASSERT(counter <= NETISR_MAXPROT,
 	    ("sysctl_netisr_proto: counter too big (%d)", counter));
 	error = SYSCTL_OUT(req, snp_array, sizeof(*snp_array) * counter);
 	free(snp_array, M_TEMP);
@@ -1220,7 +1220,7 @@ sysctl_netisr_workstream(SYSCTL_HANDLER_
 		counter++;
 	}
 	NETISR_RUNLOCK(&tracker);
-	KASSERT(counter < MAXCPU,
+	KASSERT(counter <= MAXCPU,
 	    ("sysctl_netisr_workstream: counter too big (%d)", counter));
 	error = SYSCTL_OUT(req, snws_array, sizeof(*snws_array) * counter);
 	free(snws_array, M_TEMP);
@@ -1281,7 +1281,7 @@ sysctl_netisr_work(SYSCTL_HANDLER_ARGS)
 		}
 		NWS_UNLOCK(nwsp);
 	}
-	KASSERT(counter < MAXCPU * NETISR_MAXPROT,
+	KASSERT(counter <= MAXCPU * NETISR_MAXPROT,
 	    ("sysctl_netisr_work: counter too big (%d)", counter));
 	NETISR_RUNLOCK(&tracker);
 	error = SYSCTL_OUT(req, snw_array, sizeof(*snw_array) * counter);