From: David Vrabel <david.vrabel@csr.com>
To: Roel Kluin <roel.kluin@gmail.com>
Cc: drzeus@drzeus.cx, LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH] sdio: Read buffer overflow
Date: Fri, 07 Aug 2009 17:45:49 +0100 [thread overview]
Message-ID: <4A7C5A3D.4090309@csr.com> (raw)
In-Reply-To: <4A7C4501.7070700@gmail.com>
Roel Kluin wrote:
> If the loop breaks with an index of 0, then we read before the array.
This isn't a helpful subject or changelog comment really. Suggest
sdio: avoid buffer underrun when parsing an invalid CISTPL_VERS_1
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
> diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
> index 963f293..0f8853c 100644
> --- a/drivers/mmc/core/sdio_cis.c
> +++ b/drivers/mmc/core/sdio_cis.c
> @@ -40,7 +40,7 @@ static int cistpl_vers_1(struct mmc_card *card, struct sdio_func *func,
> nr_strings++;
> }
>
> - if (buf[i-1] != '\0') {
> + if (i != 0 && buf[i-1] != '\0') {
Looking at the PC Card 8.0 spec (vol 4, section 3.2.10) this test could
simply be:
if (nr_strings < 4) {
> printk(KERN_WARNING "SDIO: ignoring broken CISTPL_VERS_1\n");
> return 0;
> }
--
David Vrabel, Senior Software Engineer, Drivers
CSR, Churchill House, Cambridge Business Park, Tel: +44 (0)1223 692562
Cowley Road, Cambridge, CB4 0WZ http://www.csr.com/
'member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom'
next prev parent reply other threads:[~2009-08-07 16:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-07 15:15 [PATCH] sdio: Read buffer overflow Roel Kluin
2009-08-07 16:45 ` David Vrabel [this message]
2009-08-07 17:42 ` Roel Kluin
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=4A7C5A3D.4090309@csr.com \
--to=david.vrabel@csr.com \
--cc=akpm@linux-foundation.org \
--cc=drzeus@drzeus.cx \
--cc=linux-kernel@vger.kernel.org \
--cc=roel.kluin@gmail.com \
/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