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

Redo previous two commit a bit different way;

Browse Source 
- Just read as much as we can.
- Handle some special tuples.
This commit is contained in:
enami 2004-10-14 03:24:00 +00:00
parent ce44fe4282
commit 10f8fdf7dd
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/dev/cardbus/cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cardbus.c,v 1.59 2004/10/10 22:26:34 enami Exp $ */ /* $NetBSD: cardbus.c,v 1.60 2004/10/14 03:24:00 enami Exp $ */
/* /*
* Copyright (c) 1997, 1998, 1999 and 2000 * Copyright (c) 1997, 1998, 1999 and 2000
@ -33,7 +33,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.59 2004/10/10 22:26:34 enami Exp $"); __KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.60 2004/10/14 03:24:00 enami Exp $");
#include "opt_cardbus.h" #include "opt_cardbus.h"
@ -239,13 +239,9 @@ cardbus_read_tuples(struct cardbus_attach_args *ca, cardbusreg_t cis_ptr,
SIMPLEQ_FOREACH(p, &rom_image, next) { SIMPLEQ_FOREACH(p, &rom_image, next) {
if (p->rom_image == if (p->rom_image ==
CARDBUS_CIS_ASI_ROM_IMAGE(cis_ptr)) { CARDBUS_CIS_ASI_ROM_IMAGE(cis_ptr)) {
if (p->image_size > len)
panic("image too large: "
"%d > %d",
p->image_size, len);
bus_space_read_region_1(p->romt, bus_space_read_region_1(p->romt,
p->romh, CARDBUS_CIS_ADDR(cis_ptr), p->romh, CARDBUS_CIS_ADDR(cis_ptr),
tuples, p->image_size); tuples, MIN(p->image_size, len));
found++; found++;
break; break;
} }
@ -264,12 +260,9 @@ cardbus_read_tuples(struct cardbus_attach_args *ca, cardbusreg_t cis_ptr,
cardbus_conf_write(cc, cf, tag, cardbus_conf_write(cc, cf, tag,
CARDBUS_COMMAND_STATUS_REG, CARDBUS_COMMAND_STATUS_REG,
command | CARDBUS_COMMAND_MEM_ENABLE); command | CARDBUS_COMMAND_MEM_ENABLE);
if (bar_size > len)
panic("bar_size too large: %d > %d",
(int)bar_size, len);
/* XXX byte order? */ /* XXX byte order? */
bus_space_read_region_1(ca->ca_memt, bar_memh, bus_space_read_region_1(ca->ca_memt, bar_memh,
cis_ptr, tuples, bar_size); cis_ptr, tuples, MIN(bar_size, len));
found++; found++;
} }
command = cardbus_conf_read(cc, cf, tag, command = cardbus_conf_read(cc, cf, tag,
@ -911,18 +904,25 @@ decode_tuple(u_int8_t *tuple, u_int8_t *end,
u_int8_t type; u_int8_t type;
u_int8_t len; u_int8_t len;
if (tuple + 2 > end)
return (NULL);
type = tuple[0]; type = tuple[0];
len = tuple[1] + 2; switch (type) {
case PCMCIA_CISTPL_NULL:
case PCMCIA_CISTPL_END:
len = 1;
break;
default:
if (tuple + 2 > end)
return (NULL);
len = tuple[1] + 2;
break;
}
if (tuple + len > end) if (tuple + len > end)
return (NULL); return (NULL);
(*func)(tuple, len, data); (*func)(tuple, len, data);
if (type == PCMCIA_CISTPL_END) if (type == PCMCIA_CISTPL_END || tuple + len == end)
return (NULL); return (NULL);
return (tuple + len); return (tuple + len);