soundwire: stream: add s_rt into slave_rt_list before sdw_config_stream
PATCH 1/1 soundwire: stream: add s_rt into slave_rt_list before sdw_config_stream
The commit 48f17f96a817 ("soundwire: stream: fix memory leak in stream config error path") fixes the memory leak by implicitly freeing the s_rt object. However, this fixing style is not very good.
The better fix is to move list_add_tail before sdw_config_stream and revert the previous commit.
--- drivers/soundwire/stream.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
drivers/soundwire/stream.c +3 -11
@@ -1373,19 +1373,11 @@ int sdw_stream_add_slave(struct sdw_slave *slave, goto stream_error; } +list_add_tail (&s_rt->m_rt_node, &m_rt->slave_rt_list); + ret =sdw_config_stream (&slave->dev, stream, stream_config, true); -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); +if (ret) goto stream_error; - } - -list_add_tail (&s_rt->m_rt_node, &m_rt->slave_rt_list); ret =sdw_slave_port_config (slave, s_rt, port_config, num_ports);if (ret)
Signature · 1 line
2.25.1
Quoted 17 lines · Dongliang Mu
The commit
48f17f96a817("soundwire: stream: fix memory leak in stream config error path") fixes the memory leak by implicitly freeing thes_rtobject. However, this fixing style is not very good.The better fix is to move
list_add_tailbeforesdw_config_streamand revert the previous commit.Signed-off-by Dongliang Mu <[email protected]>--- drivers/soundwire/stream.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)drivers/soundwire/stream.c +0
-0
drivers/soundwire/stream.c int sdw_stream_add_slave(struct sdw_slave *slave, · line 1378
Quoted 6 lines
drivers/soundwire/stream.c +2
-0@@ -1373,19 +1373,11 @@ int sdw_stream_add_slave(struct sdw_slave *slave, goto stream_error; } +list_add_tail (&s_rt->m_rt_node, &m_rt->slave_rt_list); + ret =sdw_config_stream (&slave->dev, stream, stream_config, true);
There some sanity checks on the stream inside sdw_config_stream() so that's probably why we didn't add it until later. (I don't know the code well, but that's what I would suspect from a glance).
regards,
dan carpenter
Quoted 22 lines · Dan Carpenter
Quoted 20 lines · Dongliang Mu
The commit
48f17f96a817("soundwire: stream: fix memory leak in stream config error path") fixes the memory leak by implicitly freeing thes_rtobject. However, this fixing style is not very good.The better fix is to move
list_add_tailbeforesdw_config_streamand revert the previous commit.Signed-off-by Dongliang Mu <[email protected]>--- drivers/soundwire/stream.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)drivers/soundwire/stream.c +0
-0@@ -1373,19 +1373,11 @@ int sdw_stream_add_slave(struct sdw_slave *slave, goto stream_error; }
Quoted 7 lines
drivers/soundwire/stream.c int sdw_stream_add_slave(struct sdw_slave *slave, · line 1378
Quoted 3 lines
drivers/soundwire/stream.c +2
-0+list_add_tail (&s_rt->m_rt_node, &m_rt->slave_rt_list); + ret =sdw_config_stream (&slave->dev, stream, stream_config, true);There some sanity checks on the stream inside
sdw_config_stream()so that's probably why we didn't add it until later. (I don't know the code well, but that's what I would suspect from a glance).
I think those sanity checks are not much related to list_add_tail.
Except that, do you have other concerns?
I think this patch could improve the readability of code, so I submit this patch to the mailing list. But I am not sure if the community favors this kind of patch.
Quoted 4 lines
regards,
dan carpenter
Quoted 31 lines · Dongliang Mu
Quoted 22 lines · Dan Carpenter
Quoted 20 lines · Dongliang Mu
The commit
48f17f96a817("soundwire: stream: fix memory leak in stream config error path") fixes the memory leak by implicitly freeing thes_rtobject. However, this fixing style is not very good.The better fix is to move
list_add_tailbeforesdw_config_streamand revert the previous commit.Signed-off-by Dongliang Mu <[email protected]>--- drivers/soundwire/stream.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)drivers/soundwire/stream.c +0
-0@@ -1373,19 +1373,11 @@ int sdw_stream_add_slave(struct sdw_slave *slave, goto stream_error; }Quoted 7 lines
drivers/soundwire/stream.c int sdw_stream_add_slave(struct sdw_slave *slave, · line 1378
Quoted 3 lines
drivers/soundwire/stream.c +2
-0+list_add_tail (&s_rt->m_rt_node, &m_rt->slave_rt_list); + ret =sdw_config_stream (&slave->dev, stream, stream_config, true);There some sanity checks on the stream inside
sdw_config_stream()so that's probably why we didn't add it until later. (I don't know the code well, but that's what I would suspect from a glance).
Quoted 1 line
I think those sanity checks are not much related to
list_add_tail.
Yeah. I can't point to a bug that it causes, it just feels ugly to add invalid data to the list.
You didn't add Rander to the CC list and he may have had a good reason to do it that way.
regards,
dan carpenter