提交 bd9f8b0a 编写于 作者: R Rander Wang 提交者: Zheng Zengkai

soundwire: stream: fix memory leak in stream config error path

stable inclusion
from stable-5.10.37
commit 7c468deae306d0cbbd539408c26cfec04c66159a
bugzilla: 51868
CVE: NA

--------------------------------

[ Upstream commit 48f17f96 ]

When stream config is failed, master runtime will release all
slave runtime in the slave_rt_list, but slave runtime is not
added to the list at this time. This patch frees slave runtime
in the config error path to fix the memory leak.

Fixes: 89e59053 ("soundwire: Add support for SoundWire stream management")
Signed-off-by: NRander Wang <rander.wang@intel.com>
Reviewed-by: NKeyon Jie <yang.jie@intel.com>
Reviewed-by: NGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: NPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: NBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20210331004610.12242-1-yung-chuan.liao@linux.intel.comSigned-off-by: NVinod Koul <vkoul@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 a3559c8b
...@@ -1375,8 +1375,16 @@ int sdw_stream_add_slave(struct sdw_slave *slave, ...@@ -1375,8 +1375,16 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
} }
ret = sdw_config_stream(&slave->dev, stream, stream_config, true); ret = sdw_config_stream(&slave->dev, stream, stream_config, true);
if (ret) if (ret) {
/*
* sdw_release_master_stream will release s_rt in slave_rt_list in
* stream_error case, but s_rt is only added to slave_rt_list
* when sdw_config_stream is successful, so free s_rt explicitly
* when sdw_config_stream is failed.
*/
kfree(s_rt);
goto stream_error; goto stream_error;
}
list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list); list_add_tail(&s_rt->m_rt_node, &m_rt->slave_rt_list);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册