From: Roel Kluin <roel.kluin@gmail.com>
Date: Sun, 2 Aug 2009 08:02:28 +0000 (+0000)
Subject: parisc: Fix read buffer overflow in pdc_stable driver
X-Git-Tag: v2.6.31-rc6~72^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=447c233da4d109c6194fefd69e5185cbc93cc062;p=thirdparty%2Fkernel%2Flinux.git

parisc: Fix read buffer overflow in pdc_stable driver

Check whether index is within bounds before testing the element.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Helge Deller <deller@gmx.de>
---

diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index f9f9a5f1bbd0f..13a64bc081b67 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -370,7 +370,7 @@ pdcspath_layer_read(struct pdcspath_entry *entry, char *buf)
 	if (!i)	/* entry is not ready */
 		return -ENODATA;
 	
-	for (i = 0; devpath->layers[i] && (likely(i < 6)); i++)
+	for (i = 0; i < 6 && devpath->layers[i]; i++)
 		out += sprintf(out, "%u ", devpath->layers[i]);
 
 	out += sprintf(out, "\n");