public inbox for linux-mtd@lists.infradead.org
 help / color / mirror / Atom feed
From: sonic zhang <sonic.adi@gmail.com>
To: linux-mtd@lists.infradead.org
Subject: [Patch] [ubifs] Don't define large array on local stack.
Date: Mon, 30 Mar 2009 16:22:48 +0800	[thread overview]
Message-ID: <1238401368.24899.2.camel@eight.analog.com> (raw)

On nommu arch, local stack size is very limited and can't be enlarged on demand. So, don't define large array on local stack.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>

Index: ubi-utils/src/libubigen.c
===================================================================
--- ubi-utils/src/libubigen.c	(revision 7935)
+++ ubi-utils/src/libubigen.c	(revision 7939)
@@ -287,7 +287,7 @@
 {
 	int ret;
 	struct ubigen_vol_info vi;
-	char outbuf[ui->peb_size];
+	char *outbuf;
 	struct ubi_vid_hdr *vid_hdr;
 	off_t seek;
 
@@ -302,6 +302,9 @@
 	vi.name_len = strlen(UBI_LAYOUT_VOLUME_NAME);
 	vi.compat = UBI_LAYOUT_VOLUME_COMPAT;
 
+	if ((outbuf = malloc(ui->peb_size)) == NULL)
+		return sys_errmsg("fail to malloc outbuf");
+
 	memset(outbuf, 0xFF, ui->data_offs);
 	vid_hdr = (struct ubi_vid_hdr *)(&outbuf[ui->vid_hdr_offs]);
 	memcpy(outbuf + ui->data_offs, vtbl, ui->vtbl_size);
@@ -309,22 +312,32 @@
 	       ui->peb_size - ui->data_offs - ui->vtbl_size);
 
 	seek = peb1 * ui->peb_size;
-	if (lseek(fd, seek, SEEK_SET) != seek)
+	if (lseek(fd, seek, SEEK_SET) != seek) {
+		free(outbuf);
 		return sys_errmsg("cannot seek output file");
+	}
+
 	ubigen_init_ec_hdr(ui, (struct ubi_ec_hdr *)outbuf, ec1);
 	init_vid_hdr(ui, &vi, vid_hdr, 0, NULL, 0);
 	ret = write(fd, outbuf, ui->peb_size);
-	if (ret != ui->peb_size)
+	if (ret != ui->peb_size) {
+		free(outbuf);
 		return sys_errmsg("cannot write %d bytes", ui->peb_size);
+	}
 
 	seek = peb2 * ui->peb_size;
-	if (lseek(fd, seek, SEEK_SET) != seek)
+	if (lseek(fd, seek, SEEK_SET) != seek) {
+		free(outbuf);
 		return sys_errmsg("cannot seek output file");
+	}
 	ubigen_init_ec_hdr(ui, (struct ubi_ec_hdr *)outbuf, ec2);
 	init_vid_hdr(ui, &vi, vid_hdr, 1, NULL, 0);
 	ret = write(fd, outbuf, ui->peb_size);
-	if (ret != ui->peb_size)
+	if (ret != ui->peb_size) {
+		free(outbuf);
 		return sys_errmsg("cannot write %d bytes", ui->peb_size);
+	}
 
+	free(outbuf);
 	return 0;
 }

             reply	other threads:[~2009-03-30  8:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-30  8:22 sonic zhang [this message]
2009-03-30 15:11 ` [Patch] [ubifs] Don't define large array on local stack Artem Bityutskiy

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=1238401368.24899.2.camel@eight.analog.com \
    --to=sonic.adi@gmail.com \
    --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