system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-05 08:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put a band-aide(tm) on the CIS panic problem. This is a similar fix

Browse source 
to what is in NetBSD.  I have a few cards that tickles this bug, and
this just keeps us from panicing.  It doesn't actually fix the problem
(that will happen once I figure out why some cards hate the address
their CIS is mapped to high memory).
This commit is contained in:
Warner Losh 2003-08-18 03:07:09 +00:00
parent ef13663bb6
commit 4aef3fb1c3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=119060
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sys/dev/pccard/pccard_cis.c
View file

@ -135,7 +135,8 @@ pccard_scan_cis(device_t dev, int (*fct)(struct pccard_tuple *, void *),
tuple.memh = rman_get_bushandle(res);
tuple.ptr = 0;
DPRINTF(("cis mem map %x\n", (unsigned int) tuple.memh));
DPRINTF(("cis mem map 0x%x (resource: 0x%lx)\n",
(unsigned int) tuple.memh, rman_get_start(res)));
tuple.mult = 2;
@ -150,9 +151,20 @@ pccard_scan_cis(device_t dev, int (*fct)(struct pccard_tuple *, void *),
while (1) {
while (1) {
/* get the tuple code */
tuple.code = pccard_cis_read_1(&tuple, tuple.ptr);
/*
* Perform boundary check for insane cards.
* If CIS is too long, simulate CIS end.
* (This check may not be sufficient for
* malicious cards.)
*/
if (tuple.mult * tuple.ptr >= PCCARD_CIS_SIZE - 1
- 32 /* ad hoc value */ ) {
printf("CIS is too long -- truncating\n");
tuple.code = PCCARD_CISTPL_END;
} else {
/* get the tuple code */
tuple.code = pccard_cis_read_1(&tuple, tuple.ptr);
}
/* two special-case tuples */
@ -361,7 +373,6 @@ pccard_scan_cis(device_t dev, int (*fct)(struct pccard_tuple *, void *),
* In general, this means that if one pointer fails, it will
* try the next one, instead of just bailing.
*/
while (1) {
if (longlink_present) {
CARD_SET_RES_FLAGS(device_get_parent(dev), dev,