From: walter harms <wharms@bfs.de>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: linux-mtd@lists.infradead.org, kernel-janitors@vger.kernel.org,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: [patch] mtd: sm_ftl: heap corruption in sm_create_sysfs_attributes()
Date: Thu, 05 Dec 2013 13:01:04 +0100 [thread overview]
Message-ID: <52A06B00.7070309@bfs.de> (raw)
In-Reply-To: <20131205110235.GA14728@elgon.mountain>
Am 05.12.2013 12:02, schrieb Dan Carpenter:
> We always put a NUL terminator one space past the end of the "vendor"
> buffer. Also I think the strnlen() limiter is off by one so I have made
> it smaller.
>
> Fixes: 7d17c02a01a1 ('mtd: Add new SmartMedia/xD FTL')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> Static analysis stuff. Untested.
>
> diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
> index 4b8e89583f2a..7c452714df8d 100644
> --- a/drivers/mtd/sm_ftl.c
> +++ b/drivers/mtd/sm_ftl.c
> @@ -59,11 +59,12 @@ static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
> struct attribute_group *attr_group;
> struct attribute **attributes;
> struct sm_sysfs_attribute *vendor_attribute;
> + int vendor_len;
> + char *vendor;
>
> - int vendor_len = strnlen(ftl->cis_buffer + SM_CIS_VENDOR_OFFSET,
> - SM_SMALL_PAGE - SM_CIS_VENDOR_OFFSET);
> -
> - char *vendor = kmalloc(vendor_len, GFP_KERNEL);
> + vendor_len = strnlen(ftl->cis_buffer + SM_CIS_VENDOR_OFFSET,
> + SM_SMALL_PAGE - SM_CIS_VENDOR_OFFSET - 1);
> + vendor = kmalloc(vendor_len + 1, GFP_KERNEL);
> if (!vendor)
> goto error1;
> memcpy(vendor, ftl->cis_buffer + SM_CIS_VENDOR_OFFSET, vendor_len);
Hi Dan,
is this a case for kstr(n)dup() ? like:
int maxlen=SM_SMALL_PAGE - SM_CIS_VENDOR_OFFSET-1;
char *buf=ftl->cis_buffer + SM_CIS_VENDOR_OFFSET;
vendor=kstrndup(buf,maxlen,GFP_KERNEL);
if (!vendor)
goto error1;
i added maxlen, buf to to help me understand the code,
when the source is save kstrdup() is also an option
just my to cents,
wh
next prev parent reply other threads:[~2013-12-05 12:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-05 11:02 [patch] mtd: sm_ftl: heap corruption in sm_create_sysfs_attributes() Dan Carpenter
2013-12-05 12:01 ` walter harms [this message]
2013-12-05 12:57 ` Dan Carpenter
2013-12-05 14:53 ` [patch v2] " Dan Carpenter
2014-01-28 5:32 ` Brian Norris
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=52A06B00.7070309@bfs.de \
--to=wharms@bfs.de \
--cc=dan.carpenter@oracle.com \
--cc=dwmw2@infradead.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-mtd@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).