Commit f5c6ebd5 authored Jun 17, 2020 by Pierre-Louis Bossart Committed by Greg Kroah-Hartman Jul 22, 2020

soundwire: intel: fix memory leak with devm_kasprintf



[ Upstream commit bf6d6e68d2028a2d82f4c106f50ec75cc1e6ef89 ]

The dais are allocated with devm_kcalloc() but their name isn't
resourced managed and never freed. Fix by also using devm_ for the dai
names as well.

Fixes: c46302ec ('soundwire: intel: Add audio DAI ops')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@gmail.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20200617163536.17401-1-pierre-louis.bossart@linux.intel.com


Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 7005a488

drivers/soundwire/intel.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -842,7 +842,8 @@ static int intel_create_dai(struct sdw_cdns *cdns,

		/* TODO: Read supported rates/formats from hardware */
		for (i = off; i < (off + num); i++) {
		dais[i].name = kasprintf(GFP_KERNEL, "SDW%d Pin%d",
		dais[i].name = devm_kasprintf(cdns->dev, GFP_KERNEL,
		"SDW%d Pin%d",
		cdns->instance, i);
		if (!dais[i].name)
		return -ENOMEM;