From owner-svn-src-user@FreeBSD.ORG  Wed Sep 22 01:39:55 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 80F531065670;
	Wed, 22 Sep 2010 01:39:55 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 708368FC13;
	Wed, 22 Sep 2010 01:39:55 +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 o8M1dt3R012752;
	Wed, 22 Sep 2010 01:39:55 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8M1dtQ8012750;
	Wed, 22 Sep 2010 01:39:55 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201009220139.o8M1dtQ8012750@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Wed, 22 Sep 2010 01:39:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212988 - user/weongyo/usb/sys/dev/usb
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Sep 2010 01:39:55 -0000

Author: weongyo
Date: Wed Sep 22 01:39:55 2010
New Revision: 212988
URL: http://svn.freebsd.org/changeset/base/212988

Log:
  Adds two assertion to check invalid usages of DMA pages.

Modified:
  user/weongyo/usb/sys/dev/usb/usb_busdma.c

Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_busdma.c	Wed Sep 22 01:20:05 2010	(r212987)
+++ user/weongyo/usb/sys/dev/usb/usb_busdma.c	Wed Sep 22 01:39:55 2010	(r212988)
@@ -86,6 +86,8 @@ usbd_get_page(struct usb_page_cache *pc,
 
 #if USB_HAVE_BUSDMA
 	if (pc->pages != NULL) {
+		USB_ASSERT(pc->npages > 0,
+		    ("wrong numbers of pages (%d)", pc->npages));
 		/* Case 1 - something has been loaded into DMA */
 		if (pc->buffer) {
 			/* Case 1a - Kernel Virtual Address */
@@ -97,6 +99,9 @@ usbd_get_page(struct usb_page_cache *pc,
 		index = 0;
 		if (pc->ismultiseg) {
 			index += (offset / USB_PAGE_SIZE);
+			USB_ASSERT(index < pc->npages,
+			    ("invalid index number (%d / %d)", index,
+			    pc->npages));
 			offset %= USB_PAGE_SIZE;
 			res->length = USB_PAGE_SIZE - offset;
 			res->physaddr = page[index].physaddr + offset;