Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In usb_reserve_allocm(), return an error immediately if the requested

Browse Source 
size is impossible to allocate, otherwise we might get a diagnostic
panic in subr_extent.c.
Being here, fix an off-by-one in setup.
This commit is contained in:
drochner 2009-02-10 17:00:06 +00:00
parent 1ca3ac22a3
commit c4dd0bbb21
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/usb/usb_mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_mem.c,v 1.37 2008/06/28 17:42:53 bouyer Exp $ */
/* $NetBSD: usb_mem.c,v 1.38 2009/02/10 17:00:06 drochner Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.37 2008/06/28 17:42:53 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.38 2009/02/10 17:00:06 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -303,7 +303,7 @@ usb_reserve_allocm(struct usb_dma_reserve *rs, usb_dma_t *dma, u_int32_t size)
u_long start;
bus_addr_t baddr;
if (rs->vaddr == 0)
if (rs->vaddr == 0 || size > USB_MEM_RESERVE)
return USBD_NOMEM;
dma->block = malloc(sizeof *dma->block, M_USB, M_ZERO | M_NOWAIT);
@ -378,7 +378,7 @@ usb_setup_reserve(device_t dv, struct usb_dma_reserve *rs, bus_dma_tag_t dtag,
rs->paddr = rs->map->dm_segs[0].ds_addr;
rs->extent = extent_create(device_xname(dv), (u_long)rs->paddr,
(u_long)(rs->paddr + USB_MEM_RESERVE),
(u_long)(rs->paddr + USB_MEM_RESERVE - 1),
M_USB, 0, 0, 0);
if (rs->extent == NULL) {
rs->vaddr = 0;