From owner-svn-src-user@FreeBSD.ORG  Fri Sep 24 21:55:45 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 027E0106564A;
	Fri, 24 Sep 2010 21:55:45 +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 E649F8FC08;
	Fri, 24 Sep 2010 21:55:44 +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 o8OLti0g040858;
	Fri, 24 Sep 2010 21:55:44 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8OLtir5040856;
	Fri, 24 Sep 2010 21:55:44 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201009242155.o8OLtir5040856@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Fri, 24 Sep 2010 21:55:44 +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: r213143 - 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: Fri, 24 Sep 2010 21:55:45 -0000

Author: weongyo
Date: Fri Sep 24 21:55:44 2010
New Revision: 213143
URL: http://svn.freebsd.org/changeset/base/213143

Log:
  Commits a experimental patch that I couldn't find cases when pc->buffer
  is NULL.  If this assertion is failed it means `struct usb_page_cache'
  is accessed after free or after encounting errors.

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	Fri Sep 24 21:41:56 2010	(r213142)
+++ user/weongyo/usb/sys/dev/usb/usb_busdma.c	Fri Sep 24 21:55:44 2010	(r213143)
@@ -85,11 +85,8 @@ usbd_get_page(struct usb_page_cache *pc,
 
 #if USB_HAVE_BUSDMA
 	if (pc->page_start) {
-		/* Case 1 - something has been loaded into DMA */
-		if (pc->buffer) {
-			/* Case 1a - Kernel Virtual Address */
-			res->buffer = USB_ADD_BYTES(pc->buffer, offset);
-		}
+		USB_ASSERT(pc->buffer != NULL, ("pc->buffer is NULL"));
+		res->buffer = USB_ADD_BYTES(pc->buffer, offset);
 		offset += pc->page_offset_buf;
 		/* compute destination page */
 		page = pc->page_start;