soundwire: fix double free of dangling pointer
PATCH v2 1/1 soundwire: fix double free of dangling pointer
From: Tom Rix <[email protected]>
clang static analysis flags this problem
stream.c:844:9: warning: Use of memory after
it is freed
kfree(bus->defer_msg.msg->buf);
^~~~~~~~~~~~~~~~~~~~~~~This happens in an error handler cleaning up memory allocated for elements in a list.
list_for_each_entry(m_rt, &stream->master_list, stream_node) {
bus = m_rt->bus;
kfree(bus->defer_msg.msg->buf);
kfree(bus->defer_msg.msg);
}And is triggered when the call to sdw_bank_switch() fails. There are a two problems.
First, when sdw_bank_switch() fails, though it frees memory it does not clear bus's reference 'defer_msg.msg' to that memory.
The second problem is the freeing msg->buf. In some cases msg will be NULL so this will dereference a null pointer. Need to check before freeing.
---
v2 : change title, was 'soundwire: fix error handling'
---drivers/soundwire/stream.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
drivers/soundwire/stream.c +5 -3
@@ -717,6 +717,7 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_rt_count)kfree (wbuf); error_1:kfree (wr_msg); + bus->defer_msg.msg =NULL ;return ret; }
@@ -840,9 +841,10 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) error:list_for_each_entry (m_rt, &stream->master_list, stream_node) { bus = m_rt->bus; - -kfree (bus->defer_msg.msg->buf); -kfree (bus->defer_msg.msg); +if (bus->defer_msg.msg) { +kfree (bus->defer_msg.msg->buf); +kfree (bus->defer_msg.msg); + } } msg_unlock:
Signature · 1 line
2.18.1
Wed, 2 Sep 2020 13:26:50 -0700
Quoted 67 lines
From: Tom Rix <[email protected]>
clang static analysis flags this problem
stream.c:844:9: warning: Use of memory after
it is freedkfree(bus->defer_msg.msg->buf); ^~~~~~~~~~~~~~~~~~~~~~~This happens in an error handler cleaning up memory allocated for elements in a list.
list_for_each_entry(m_rt, &stream->master_list, stream_node) { bus = m_rt->bus; kfree(bus->defer_msg.msg->buf); kfree(bus->defer_msg.msg); }And is triggered when the call to
sdw_bank_switch()fails. There are a two problems.First, when
sdw_bank_switch()fails, though it frees memory it does not clear bus's reference 'defer_msg.msg' to that memory.The second problem is the freeing
msg->buf. In some cases msg will be NULL so this will dereference a null pointer. Need to check before freeing.Fixes 99b8a5d608a6 ("soundwire: Add bank switch routine")Signed-off-by Tom Rix <[email protected]>Reviewed-by Nick Desaulniers <[email protected]>Reviewed-by Pierre-Louis Bossart <[email protected]>---
v2 : change title, was 'soundwire: fix error handling'
---drivers/soundwire/stream.c| 8 +++++---1 file changed, 5 insertions(+), 3 deletions(-)drivers/soundwire/stream.c +5
-3@@ -717,6 +717,7 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_rt_count)kfree (wbuf); error_1:kfree (wr_msg); + bus->defer_msg.msg =NULL ;return ret; }@@ -840,9 +841,10 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) error:list_for_each_entry (m_rt, &stream->master_list, stream_node) { bus = m_rt->bus; - -kfree (bus->defer_msg.msg->buf); -kfree (bus->defer_msg.msg); +if (bus->defer_msg.msg) { +kfree (bus->defer_msg.msg->buf); +kfree (bus->defer_msg.msg); + } } msg_unlock:Signature · 1 line
2.18.1
Looks like it needs also to release the current buf before putting the new one into place.
drivers/soundwire/stream.c +4 -0
@@ -665,6 +665,10 @@ static int sdw_bank_switch(struct sdw_buif (!wr_msg)return -ENOMEM ; +if (bus->defer_msg.msg) { +kfree (bus->defer_msg.msg->buf); +kfree (bus->defer_msg.msg); + } bus->defer_msg.msg = wr_msg; wbuf =kzalloc (sizeof (*wbuf),GFP_KERNEL );
Quoted 22 lines · On 02-09-20, 13:26, [email protected] wrote:
From: Tom Rix <[email protected]>
clang static analysis flags this problem
stream.c:844:9: warning: Use of memory after
it is freedkfree(bus->defer_msg.msg->buf); ^~~~~~~~~~~~~~~~~~~~~~~This happens in an error handler cleaning up memory allocated for elements in a list.
list_for_each_entry(m_rt, &stream->master_list, stream_node) { bus = m_rt->bus; kfree(bus->defer_msg.msg->buf); kfree(bus->defer_msg.msg); }And is triggered when the call to
sdw_bank_switch()fails. There are a two problems.
Quoted 6 lines
First, when
sdw_bank_switch()fails, though it frees memory it does not clear bus's reference 'defer_msg.msg' to that memory.The second problem is the freeing
msg->buf. In some cases msg will be NULL so this will dereference a null pointer. Need to check before freeing.
Applied, thanks
Signature · 1 line
~Vinod