From owner-svn-src-all@FreeBSD.ORG  Wed Oct 17 18:21:15 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1BD9756F;
 Wed, 17 Oct 2012 18:21:15 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 02F0B8FC0C;
 Wed, 17 Oct 2012 18:21:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9HILEGb032425;
 Wed, 17 Oct 2012 18:21:14 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9HILEL4032423;
 Wed, 17 Oct 2012 18:21:14 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201210171821.q9HILEL4032423@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 17 Oct 2012 18:21:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241643 - head/sys/dev/netmap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 17 Oct 2012 18:21:15 -0000

Author: emaste
Date: Wed Oct 17 18:21:14 2012
New Revision: 241643
URL: http://svn.freebsd.org/changeset/base/241643

Log:
  Avoid panic when a netmap instance cannot obtain memory.
  
  A uint32_t is always >= 0.
  
  Sponsored by: ADARA Networks

Modified:
  head/sys/dev/netmap/netmap_mem2.c

Modified: head/sys/dev/netmap/netmap_mem2.c
==============================================================================
--- head/sys/dev/netmap/netmap_mem2.c	Wed Oct 17 16:37:16 2012	(r241642)
+++ head/sys/dev/netmap/netmap_mem2.c	Wed Oct 17 18:21:14 2012	(r241643)
@@ -325,7 +325,8 @@ netmap_new_bufs(struct netmap_if *nifp,
 	return;
 
 cleanup:
-	for (i--; i >= 0; i--) {
+	while (i > 0) {
+		i--;
 		netmap_obj_free(nm_mem->nm_buf_pool, slot[i].buf_idx);
 	}
 }