mtd: cfi_cmdset_0001: fixing memory leak and handling failed kmalloc
kmalloc needs to be handled when failing in memory pressure. Also, it has memory leak in error routine. Signed-off-by: Insu Yun <wuninsu@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>hifive-unleashed-5.1
parent
32321e950d
commit
33853ebd74
|
@ -596,7 +596,7 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
|
||||||
mtd->size = devsize * cfi->numchips;
|
mtd->size = devsize * cfi->numchips;
|
||||||
|
|
||||||
mtd->numeraseregions = cfi->cfiq->NumEraseRegions * cfi->numchips;
|
mtd->numeraseregions = cfi->cfiq->NumEraseRegions * cfi->numchips;
|
||||||
mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info)
|
mtd->eraseregions = kzalloc(sizeof(struct mtd_erase_region_info)
|
||||||
* mtd->numeraseregions, GFP_KERNEL);
|
* mtd->numeraseregions, GFP_KERNEL);
|
||||||
if (!mtd->eraseregions)
|
if (!mtd->eraseregions)
|
||||||
goto setup_err;
|
goto setup_err;
|
||||||
|
@ -614,6 +614,8 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
|
||||||
mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].erasesize = ersize;
|
mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].erasesize = ersize;
|
||||||
mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].numblocks = ernum;
|
mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].numblocks = ernum;
|
||||||
mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].lockmap = kmalloc(ernum / 8 + 1, GFP_KERNEL);
|
mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].lockmap = kmalloc(ernum / 8 + 1, GFP_KERNEL);
|
||||||
|
if (!mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].lockmap)
|
||||||
|
goto setup_err;
|
||||||
}
|
}
|
||||||
offset += (ersize * ernum);
|
offset += (ersize * ernum);
|
||||||
}
|
}
|
||||||
|
@ -650,6 +652,10 @@ static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
|
||||||
return mtd;
|
return mtd;
|
||||||
|
|
||||||
setup_err:
|
setup_err:
|
||||||
|
if (mtd->eraseregions)
|
||||||
|
for (i=0; i<cfi->cfiq->NumEraseRegions; i++)
|
||||||
|
for (j=0; j<cfi->numchips; j++)
|
||||||
|
kfree(mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].lockmap);
|
||||||
kfree(mtd->eraseregions);
|
kfree(mtd->eraseregions);
|
||||||
kfree(mtd);
|
kfree(mtd);
|
||||||
kfree(cfi->cmdset_priv);
|
kfree(cfi->cmdset_priv);
|
||||||
|
|
Loading…
Reference in New Issue