From: akpm@linux-foundation.org
To: torvalds@linux-foundation.org
Cc: akpm@linux-foundation.org, roel.kluin@gmail.com,
david.vrabel@csr.com, linux-mmc@vger.kernel.org
Subject: [patch 077/232] sdio: fix read buffer overflow
Date: Tue, 22 Sep 2009 16:45:09 -0700 [thread overview]
Message-ID: <200909222345.n8MNj9kq013725@imap1.linux-foundation.org> (raw)
From: Roel Kluin <roel.kluin@gmail.com>
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>
---
drivers/mmc/core/sdio_cis.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/mmc/core/sdio_cis.c~sdio-fix-read-buffer-overflow drivers/mmc/core/sdio_cis.c
--- a/drivers/mmc/core/sdio_cis.c~sdio-fix-read-buffer-overflow
+++ a/drivers/mmc/core/sdio_cis.c
@@ -40,7 +40,7 @@ static int cistpl_vers_1(struct mmc_card
nr_strings++;
}
- if (buf[i-1] != '\0') {
+ if (nr_strings < 4) {
printk(KERN_WARNING "SDIO: ignoring broken CISTPL_VERS_1\n");
return 0;
}
_
next reply other threads:[~2009-09-22 23:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-22 23:45 akpm [this message]
2009-10-01 10:08 ` [patch 077/232] sdio: fix read buffer overflow Jonathan Cameron
2009-10-01 11:12 ` David Vrabel
2009-10-01 11:16 ` David Vrabel
2009-10-01 14:11 ` Jonathan Cameron
2009-10-06 21:49 ` Bing Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200909222345.n8MNj9kq013725@imap1.linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=david.vrabel@csr.com \
--cc=linux-mmc@vger.kernel.org \
--cc=roel.kluin@gmail.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox