| Message ID | 20210104041137.113075-5-manivannan.sadhasivam@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7b844cf445f0a7daa68be0ce71eb2c88d68b0c5d |
| Headers | show |
| Series | Add support for Qcom SMEM based NAND parser | expand |
On Mon, 2021-01-04 at 04:11:37 UTC, Manivannan Sadhasivam wrote: > In the case of failure while parsing the partitions, the iterator should > be pre decremented by one before starting to free the memory allocated > by kstrdup(). Because in the failure case, kstrdup() will not succeed > and thus no memory will be allocated for the current iteration. > > Fixes: 1fca1f6abb38 ("mtd: afs: simplify partition parsing") > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > Cc: Linus Walleij <linus.walleij@linaro.org> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. Miquel
diff --git a/drivers/mtd/parsers/afs.c b/drivers/mtd/parsers/afs.c index 980e332bdac4..26116694c821 100644 --- a/drivers/mtd/parsers/afs.c +++ b/drivers/mtd/parsers/afs.c @@ -370,10 +370,8 @@ static int parse_afs_partitions(struct mtd_info *mtd, return i; out_free_parts: - while (i >= 0) { + while (--i >= 0) kfree(parts[i].name); - i--; - } kfree(parts); *pparts = NULL; return ret;
In the case of failure while parsing the partitions, the iterator should be pre decremented by one before starting to free the memory allocated by kstrdup(). Because in the failure case, kstrdup() will not succeed and thus no memory will be allocated for the current iteration. Fixes: 1fca1f6abb38 ("mtd: afs: simplify partition parsing") Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Cc: Linus Walleij <linus.walleij@linaro.org> --- drivers/mtd/parsers/afs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)