summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/chips
diff options
context:
space:
mode:
authorHou Tao <houtao1@huawei.com>2019-10-08 10:36:37 +0800
committerVignesh Raghavendra <vigneshr@ti.com>2019-11-09 14:42:47 +0530
commit03976af89e3bd9489d542582a325892e6a8cacc0 (patch)
treeb908fec9698133c0bec610db17ab016ceca0ef99 /drivers/mtd/chips
parentea4f51356fd986124beeab8e21b048dfe06d67e7 (diff)
downloadlinux-03976af89e3bd9489d542582a325892e6a8cacc0.tar.gz
linux-03976af89e3bd9489d542582a325892e6a8cacc0.tar.bz2
linux-03976af89e3bd9489d542582a325892e6a8cacc0.zip
mtd: cfi_cmdset_0002: don't free cfi->cfiq in error path of cfi_amdstd_setup()
Else there may be a double-free problem, because cfi->cfiq will be freed by mtd_do_chip_probe() if both the two invocations of check_cmd_set() return failure. Signed-off-by: Hou Tao <houtao1@huawei.com> Reviewed-by: Richard Weinberger <richard@nod.at> Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Diffstat (limited to 'drivers/mtd/chips')
-rw-r--r--drivers/mtd/chips/cfi_cmdset_0002.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index f4fb860fcaf6..5b2a25b49333 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -785,7 +785,6 @@ static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
kfree(mtd->eraseregions);
kfree(mtd);
kfree(cfi->cmdset_priv);
- kfree(cfi->cfiq);
return NULL;
}