diff options
| author | sam <sam@FreeBSD.org> | 2005-02-25 19:47:18 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-02-25 19:47:18 +0000 |
| commit | 02a0a9685911169c99a55f2549f24a982de4cd6f (patch) | |
| tree | cadfbbf21bb509d42babe4deb3963e4205c36257 /sys/dev/puc | |
| parent | e5a9c072c1563b17574a8123220f8773afeedcee (diff) | |
| download | FreeBSD-src-02a0a9685911169c99a55f2549f24a982de4cd6f.zip FreeBSD-src-02a0a9685911169c99a55f2549f24a982de4cd6f.tar.gz | |
fail gracefully rather than using an invalid array index if unable
to allocate a bar; it's unclear whether this can happen in practice
Noticed by: Coverity Prevent analysis tool
Discussed with: marcel
Diffstat (limited to 'sys/dev/puc')
| -rw-r--r-- | sys/dev/puc/puc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c index 52a0d52..86e2a0c 100644 --- a/sys/dev/puc/puc.c +++ b/sys/dev/puc/puc.c @@ -128,6 +128,10 @@ puc_port_bar_index(struct puc_softc *sc, int bar) if (sc->sc_bar_mappings[i].bar == bar) return (i); } + if (i == PUC_MAX_BAR) { + printf("%s: out of bars!\n", __func__); + return (-1); + } sc->sc_bar_mappings[i].bar = bar; sc->sc_bar_mappings[i].used = 1; return (i); @@ -215,7 +219,7 @@ puc_attach(device_t dev, const struct puc_device_description *desc) rid = sc->sc_desc.ports[i].bar; bidx = puc_port_bar_index(sc, rid); - if (sc->sc_bar_mappings[bidx].res != NULL) + if (bidx < 0 || sc->sc_bar_mappings[bidx].res != NULL) continue; type = (sc->sc_desc.ports[i].flags & PUC_FLAGS_MEMORY) @@ -261,7 +265,7 @@ puc_attach(device_t dev, const struct puc_device_description *desc) for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { rid = sc->sc_desc.ports[i].bar; bidx = puc_port_bar_index(sc, rid); - if (sc->sc_bar_mappings[bidx].res == NULL) + if (bidx < 0 || sc->sc_bar_mappings[bidx].res == NULL) continue; switch (sc->sc_desc.ports[i].type & ~PUC_PORT_SUBTYPE_MASK) { |
