From: Jan Weitzel <J.Weitzel@phytec.de>
To: barebox@lists.infradead.org
Subject: Re: [PATCH] ubiformat: get buffer from malloc
Date: Mon, 25 Mar 2013 16:25:08 +0100 [thread overview]
Message-ID: <1364225108.7010.2.camel@lws-weitzel> (raw)
In-Reply-To: <1364224557-1840-1-git-send-email-j.weitzel@phytec.de>
Am Montag, den 25.03.2013, 16:15 +0100 schrieb Jan Weitzel:
> There was a erase block sized (here 131072) char buf array on the stack.
> Changed this to get the space from malloc preventing stack overflows.
> Also fix a wrong return without clean up.
>
btw the command works fine with the stack overflow till CONFIG_MMU_EARLY
was turned on.
Jan
> Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
> ---
> commands/ubiformat.c | 22 +++++++++++++++-------
> 1 files changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/commands/ubiformat.c b/commands/ubiformat.c
> index 47941be..121816f 100644
> --- a/commands/ubiformat.c
> +++ b/commands/ubiformat.c
> @@ -296,13 +296,20 @@ static int mark_bad(const struct mtd_dev_info *mtd, struct ubi_scan_info *si, in
> static int flash_image(const struct mtd_dev_info *mtd,
> const struct ubigen_info *ui, struct ubi_scan_info *si)
> {
> - int fd, img_ebs, eb, written_ebs = 0, divisor;
> + int fd, img_ebs, eb, written_ebs = 0, divisor, ret = -1;
> off_t st_size;
> + char *buf = NULL;
>
> fd = open_file(&st_size);
> if (fd < 0)
> return fd;
>
> + buf = malloc(mtd->eb_size);
> + if (!buf) {
> + sys_errmsg("cannot allocate %d bytes of memory", mtd->eb_size);
> + goto out_close;
> + }
> +
> img_ebs = st_size / mtd->eb_size;
>
> if (img_ebs > si->good_cnt) {
> @@ -312,8 +319,9 @@ static int flash_image(const struct mtd_dev_info *mtd,
> }
>
> if (st_size % mtd->eb_size) {
> - return sys_errmsg("file \"%s\" (size %lld bytes) is not multiple of ""eraseblock size (%d bytes)",
> - args.image, (long long)st_size, mtd->eb_size);
> + sys_errmsg("file \"%s\" (size %lld bytes) is not multiple of "
> + "eraseblock size (%d bytes)",
> + args.image, (long long)st_size, mtd->eb_size);
> goto out_close;
> }
>
> @@ -321,7 +329,6 @@ static int flash_image(const struct mtd_dev_info *mtd,
> divisor = img_ebs;
> for (eb = 0; eb < mtd->eb_cnt; eb++) {
> int err, new_len;
> - char buf[mtd->eb_size];
> long long ec;
>
> if (!args.quiet && !args.verbose) {
> @@ -404,12 +411,13 @@ static int flash_image(const struct mtd_dev_info *mtd,
>
> if (!args.quiet && !args.verbose)
> printf("\n");
> - close(fd);
> - return eb + 1;
> +
> + ret = eb + 1;
>
> out_close:
> + free(buf);
> close(fd);
> - return -1;
> + return ret;
> }
>
> static int format(const struct mtd_dev_info *mtd,
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-03-25 15:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-25 15:15 Jan Weitzel
2013-03-25 15:25 ` Jan Weitzel [this message]
2013-03-25 15:32 ` Alexander Aring
2013-03-25 15:34 ` Alexander Aring
2013-03-27 8:04 ` Sascha Hauer
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=1364225108.7010.2.camel@lws-weitzel \
--to=j.weitzel@phytec.de \
--cc=barebox@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