xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Tükrözés 0
Kód Hibajegyek Egyesítési kérések Actions Packages Projektek Kiadások Wiki Tevékenység

mtd: rawnand: nandsim: Free partition names on error in ns_init()

Forráskód böngészése 
The ns_init() function shall free the partition names allocated by
ns_get_partition_name() on error.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200525085851.17682-9-miquel.raynal@bootlin.com
This commit is contained in:
Miquel Raynal
2020-05-25 10:58:42 +02:00
szülő 058018eb02
commit 52bc51c54e
1 fájl változott, egészen pontosan 13 új sor hozzáadva és 4 régi sor törölve
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/mtd/nand/raw/nandsim.c
Fájl megtekintése

@@ -722,12 +722,14 @@ static int __init ns_init(struct mtd_info *mtd)
if (remains) {
if (parts_num + 1 > ARRAY_SIZE(ns->partitions)) {
NS_ERR("too many partitions.\n");
return -EINVAL;
ret = -EINVAL;
goto free_partition_names;
}
ns->partitions[i].name = ns_get_partition_name(i);
if (!ns->partitions[i].name) {
NS_ERR("unable to allocate memory.\n");
return -ENOMEM;
ret = -ENOMEM;
goto free_partition_names;
}
ns->partitions[i].offset = next_offset;
ns->partitions[i].size = remains;
@@ -756,18 +758,25 @@ static int __init ns_init(struct mtd_info *mtd)
ret = ns_alloc_device(ns);
if (ret)
return ret;
goto free_partition_names;
/* Allocate / initialize the internal buffer */
ns->buf.byte = kmalloc(ns->geom.pgszoob, GFP_KERNEL);
if (!ns->buf.byte) {
NS_ERR("init_nandsim: unable to allocate %u bytes for the internal buffer\n",
ns->geom.pgszoob);
return -ENOMEM;
ret = -ENOMEM;
goto free_partition_names;
}
memset(ns->buf.byte, 0xFF, ns->geom.pgszoob);
return 0;
free_partition_names:
for (i = 0; i < ARRAY_SIZE(ns->partitions); ++i)
kfree(ns->partitions[i].name);
return ret;
}
/*