From patchwork Thu Aug 6 23:05:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [6/8] slram: fix read buffer overflow Date: Thu, 06 Aug 2009 13:05:36 -0000 From: Andrew Morton X-Patchwork-Id: 30904 Message-Id: <200908062305.n76N5aeS004967@imap1.linux-foundation.org> To: dwmw2@infradead.org Cc: roel.kluin@gmail.com, akpm@linux-foundation.org, linux-mtd@lists.infradead.org From: Roel Kluin map[count] is checked before count < SLRAM_MAX_DEVICES_PARAMS declared on drivers/mtd/devices/slram.c:66: static char *map[SLRAM_MAX_DEVICES_PARAMS]; [akpm@linux-foundation.org: cleanups] Signed-off-by: Roel Kluin Cc: David Woodhouse Signed-off-by: Andrew Morton --- drivers/mtd/devices/slram.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN drivers/mtd/devices/slram.c~slram-read-buffer-overflow drivers/mtd/devices/slram.c --- a/drivers/mtd/devices/slram.c~slram-read-buffer-overflow +++ a/drivers/mtd/devices/slram.c @@ -341,9 +341,8 @@ static int __init init_slram(void) #else int count; - for (count = 0; (map[count]) && (count < SLRAM_MAX_DEVICES_PARAMS); - count++) { - } + for (count = 0; count < SLRAM_MAX_DEVICES_PARAMS && map[count]; count++) + ; if ((count % 3 != 0) || (count == 0)) { E("slram: not enough parameters.\n");