diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-12-21 09:41:52 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-12-21 11:13:25 +0100 |
commit | c0f46a1d3d13548d0a68686a87647c8a85f49e95 (patch) | |
tree | cca78792b6f71f1106ee21fab25ef93017a22744 | |
parent | 142a3b01858805acf37d081af8ddfd4266925b43 (diff) | |
download | barebox-c0f46a1d3d13548d0a68686a87647c8a85f49e95.tar.gz barebox-c0f46a1d3d13548d0a68686a87647c8a85f49e95.tar.xz |
commands/nand.c: Fix memory hole
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | commands/nand.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/commands/nand.c b/commands/nand.c index cbf1058d20..55b89af31b 100644 --- a/commands/nand.c +++ b/commands/nand.c @@ -224,31 +224,37 @@ static struct file_operations nand_bb_ops = { int dev_add_bb_dev(char *path, const char *name) { struct nand_bb *bb; - int ret; + int ret = -ENOMEM; struct stat s; bb = xzalloc(sizeof(*bb)); bb->devname = asprintf("/dev/%s", basename(path)); + if (!bb->devname) + goto out1; + if (name) bb->cdev.name = strdup(name); else bb->cdev.name = asprintf("%s.bb", basename(path)); + if (!bb->cdev.name) + goto out2; + ret = stat(bb->devname, &s); if (ret) - goto free_out; + goto out3; bb->raw_size = s.st_size; bb->fd = open(bb->devname, O_RDWR); if (bb->fd < 0) { ret = -ENODEV; - goto free_out; + goto out3; } ret = ioctl(bb->fd, MEMGETINFO, &bb->info); if (ret) - goto free_out; + goto out4; nand_bb_calc_size(bb); bb->cdev.ops = &nand_bb_ops; @@ -258,7 +264,13 @@ int dev_add_bb_dev(char *path, const char *name) return 0; -free_out: +out4: + close(bb->fd); +out3: + free(bb->cdev.name); +out2: + free(bb->devname); +out1: free(bb); return ret; } |