mtd: parsers: afs: Fix freeing the part name memory in failure
authorManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Mon, 4 Jan 2021 04:11:37 +0000 (09:41 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 09:26:24 +0000 (10:26 +0100)
[ Upstream commit 7b844cf445f0a7daa68be0ce71eb2c88d68b0c5d ]

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>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210104041137.113075-5-manivannan.sadhasivam@linaro.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mtd/parsers/afs.c

index 752b6cf005f715c8e45bd46bbce050834085b0f4..8fd61767af831edbaa5e00dd76ca20ca4fb20dce 100644 (file)
@@ -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;