Patchwork [ubifs] Don't define large array on local stack.

login
register
mail settings
Submitter Sonic Zhang
Date March 30, 2009, 8:22 a.m.
Message ID <1238401368.24899.2.camel@eight.analog.com>
Download mbox | patch
Permalink /patch/25297/
State New, archived
Headers show

Comments

Sonic Zhang - March 30, 2009, 8:22 a.m.
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>
Artem Bityutskiy - March 30, 2009, 3:11 p.m.
On Mon, 2009-03-30 at 16:22 +0800, sonic zhang wrote:
> 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>

Well, this was not a proper patch applicable by git-am. But
I amended it and applied. Also I changed the patch a little
to make it nicer.

Thank you!

Patch

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;
 }