Commit a8fedff3 authored Oct 08, 2019 by Hou Tao Committed by Greg Kroah-Hartman Oct 01, 2020

mtd: cfi_cmdset_0002: don't free cfi->cfiq in error path of cfi_amdstd_setup()



[ Upstream commit 03976af89e3bd9489d542582a325892e6a8cacc0 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a889845b

drivers/mtd/chips/cfi_cmdset_0002.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -722,7 +722,6 @@ static struct mtd_info cfi_amdstd_setup(struct mtd_info mtd)
	kfree(mtd->eraseregions);		kfree(mtd->eraseregions);
	kfree(mtd);		kfree(mtd);
	kfree(cfi->cmdset_priv);		kfree(cfi->cmdset_priv);
	kfree(cfi->cfiq);
	return NULL;		return NULL;
	}		}