Commit 4245c025 authored Sep 22, 2009 by Roel Kluin Committed by Linus Torvalds Sep 23, 2009

sdio: fix read buffer overflow



Avoid buffer underrun when parsing an invalid CISTPL_VERS_1.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: David Vrabel <david.vrabel@csr.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent e9510176

drivers/mmc/core/sdio_cis.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ static int cistpl_vers_1(struct mmc_card card, struct sdio_func func,
	nr_strings++;		nr_strings++;
	}		}

	if (buf[i-1] != '\0') {		if (nr_strings < 4) {
	printk(KERN_WARNING "SDIO: ignoring broken CISTPL_VERS_1\n");		printk(KERN_WARNING "SDIO: ignoring broken CISTPL_VERS_1\n");
	return 0;		return 0;
	}		}