From: Adrian Bunk <bunk@stusta.de>
This patch fixes an array overflow found by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/pnp/pnpbios/rsparser.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
diff -puN drivers/pnp/pnpbios/rsparser.c~drivers-pnp-pnpbios-rsparserc-fix-an-array-overflow drivers/pnp/pnpbios/rsparser.c
--- 25/drivers/pnp/pnpbios/rsparser.c~drivers-pnp-pnpbios-rsparserc-fix-an-array-overflow 2005-04-10 15:13:51.000000000 -0700
+++ 25-akpm/drivers/pnp/pnpbios/rsparser.c 2005-04-10 15:13:51.000000000 -0700
@@ -72,7 +72,9 @@ static void
pnpbios_parse_allocated_dmaresource(struct pnp_resource_table * res, int dma)
{
int i = 0;
- while (!(res->dma_resource[i].flags & IORESOURCE_UNSET) && i < PNP_MAX_DMA) i++;
+ while (i < PNP_MAX_DMA &&
+ !(res->dma_resource[i].flags & IORESOURCE_UNSET))
+ i++;
if (i < PNP_MAX_DMA) {
res->dma_resource[i].flags = IORESOURCE_DMA; // Also clears _UNSET flag
if (dma == -1) {
_