From owner-svn-src-user@FreeBSD.ORG Mon Sep 20 19:36:53 2010 Return-Path: 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 6E5641065673; Mon, 20 Sep 2010 19:36:53 +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 5E1A88FC0A; Mon, 20 Sep 2010 19:36:53 +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 o8KJarJj065052; Mon, 20 Sep 2010 19:36:53 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8KJar4B065050; Mon, 20 Sep 2010 19:36:53 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201009201936.o8KJar4B065050@svn.freebsd.org> From: Weongyo Jeong Date: Mon, 20 Sep 2010 19:36:53 +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: r212925 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2010 19:36:53 -0000 Author: weongyo Date: Mon Sep 20 19:36:53 2010 New Revision: 212925 URL: http://svn.freebsd.org/changeset/base/212925 Log: Just assumes that the number of segment by bus_dmamap_load(9) is always 1 because currently it looks handling the multiple segments cause a kernel crash that the number of array `pc->page_start' isn't known. It means it could lead invalid memory access and override the kernel memory value when the array size is 1 and segments are over 1. 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 Mon Sep 20 19:30:20 2010 (r212924) +++ user/weongyo/usb/sys/dev/usb/usb_busdma.c Mon Sep 20 19:36:53 2010 (r212925) @@ -425,12 +425,13 @@ usb_pc_common_mem_cb(void *arg, bus_dma_ if (error) goto done; + USB_ASSERT(nseg == 1, ("too many segments (%d)", nseg)); + pg = pc->page_start; pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); rem = segs->ds_addr & (USB_PAGE_SIZE - 1); pc->page_offset_buf = rem; pc->page_offset_end += rem; - nseg--; #ifdef USB_DEBUG if (rem != (USB_P2U(pc->buffer) & (USB_PAGE_SIZE - 1))) { /* @@ -441,12 +442,6 @@ usb_pc_common_mem_cb(void *arg, bus_dma_ goto done; } #endif - while (nseg > 0) { - nseg--; - segs++; - pg++; - pg->physaddr = segs->ds_addr & ~(USB_PAGE_SIZE - 1); - } done: mtx_lock(uptag->mtx); uptag->dma_error = (error ? 1 : 0);