Patchwork UBI: Return -ENOMEM upon failing malloc

login
register
mail settings
Submitter Stefan Roese
Date Dec. 10, 2008, 9:42 a.m.
Message ID <1228902174-24597-1-git-send-email-sr@denx.de>
Download mbox | patch
Permalink /patch/13146/
State New
Headers show

Comments

Stefan Roese - Dec. 10, 2008, 9:42 a.m.
Return with correct error code (-ENOMEM) from ubi_attach_mtd_dev() upon
failing malloc().

Signed-off-by: Stefan Roese <sr@denx.de>
---
 drivers/mtd/ubi/build.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
Artem Bityutskiy - Dec. 10, 2008, 10:54 a.m.
On Wed, 2008-12-10 at 10:42 +0100, Stefan Roese wrote:
> Return with correct error code (-ENOMEM) from ubi_attach_mtd_dev() upon
> failing malloc().
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  drivers/mtd/ubi/build.c |   16 +++++++++++-----
>  1 files changed, 11 insertions(+), 5 deletions(-)

Thanks for the patch. I've improved it a little bit and pushed:
http://git.infradead.org/users/dedekind/ubi-2.6.git?a=commit;h=ad5942bad6addcf9697a74413b517d9724d803a4

Patch

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index c7630a2..485c0fc 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -816,18 +816,24 @@  int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset)
 		goto out_free;
 
 	ubi->peb_buf1 = vmalloc(ubi->peb_size);
-	if (!ubi->peb_buf1)
+	if (!ubi->peb_buf1) {
+		err = -ENOMEM;
 		goto out_free;
+	}
 
 	ubi->peb_buf2 = vmalloc(ubi->peb_size);
-	if (!ubi->peb_buf2)
-		 goto out_free;
+	if (!ubi->peb_buf2) {
+		err = -ENOMEM;
+		goto out_free;
+	}
 
 #ifdef CONFIG_MTD_UBI_DEBUG
 	mutex_init(&ubi->dbg_buf_mutex);
 	ubi->dbg_peb_buf = vmalloc(ubi->peb_size);
-	if (!ubi->dbg_peb_buf)
-		 goto out_free;
+	if (!ubi->dbg_peb_buf) {
+		err = -ENOMEM;
+		goto out_free;
+	}
 #endif
 
 	err = attach_by_scanning(ubi);