From: Adrian Bunk <bunk@stusta.de>
Date: Sun, 1 May 2005 15:59:29 +0000 (-0700)
Subject: [PATCH] drivers/pnp/pnpbios/rsparser.c: fix an array overflow
X-Git-Tag: v2.6.12-rc4~136^2~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6e3e98d1dcf944b999757b769d910f2b506ca5b9;p=~shefty%2Frdma-dev.git

[PATCH] drivers/pnp/pnpbios/rsparser.c: fix an array overflow

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index 618ac15a9e9..79bce7b7574 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -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) {