bass: Fix possible crash on bass_update_bis_sync
Luiz Augusto von Dentz
maintainerPATCH v2 1/4 bass: Fix possible crash on bass_update_bis_sync
From: Luiz Augusto von Dentz <[email protected]>
bass_update_bis_sync does use bass_remove_bis which may end up removing the current entry causing a crash on entry->next, to avoid that prefetch the next entry.
--- profiles/audio/bass.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
profiles/audio/bass.c +6 -2
@@ -2014,11 +2014,15 @@ static void bass_update_bis_sync(struct bass_delegator *dg,const struct queue_entry *entry;/* Check if existing setups if BIS needs to be added/removed */ -for (entry =queue_get_entries (dg->setups); entry; - entry = entry->next) { +for (entry =queue_get_entries (dg->setups); entry;) {struct bass_setup *setup = entry->data;uint8_t state; +/* Prefetch next entry since the likes of bass_remove_bis can +* end up removing the next entry. +*/ + entry = entry->next; + state =bt_bap_stream_get_state (setup->stream); DBG("stream %p: BIS %d state %s(%u)", setup->stream, setup->bis,
Signature · 1 line
2.54.0
Luiz Augusto von Dentz
maintainerPATCH v2 2/4 shared/bap: Check if stream is valid before attempting to release
From: Luiz Augusto von Dentz <[email protected]>
bt_bap_stream_release shall check if the stream is still valid before attempting to release it just as done with other operations.
--- src/shared/bap.c | 3 +++ 1 file changed, 3 insertions(+)
src/shared/bap.c +3 -0
@@ -6727,6 +6727,9 @@ unsigned int bt_bap_stream_release(struct bt_bap_stream *stream,unsigned int id;struct bt_bap *bap; +if (!bap_stream_valid (stream)) +return 0 ; +if (!stream || !stream->ops || !stream->ops->release)return 0 ;
Signature · 1 line
2.54.0
Luiz Augusto von Dentz
maintainerPATCH v2 3/4 shared/bap: Don't transition to IDLE inside bap_bcast_set_state
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
Remove the recursive stream_set_state(IDLE) call from the RELEASING case in bap_bcast_set_state. This call re-entered bap_bcast_set_state while the state_cbs queue was still being iterated, causing a use-after-free if a callback unregistered itself during notification.
--- src/shared/bap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/shared/bap.c +1 -1
@@ -2436,7 +2436,6 @@ static void bap_bcast_set_state(struct bt_bap_stream *stream, uint8_t state)break ;case BT_ASCS_ASE_STATE_RELEASING :bap_stream_io_detach (stream); -stream_set_state (stream,BT_BAP_STREAM_STATE_IDLE );break ;case BT_ASCS_ASE_STATE_ENABLING :if (bt_bap_stream_get_io (stream))
@@ -2579,6 +2578,7 @@ static unsigned int bap_bcast_release(struct bt_bap_stream *stream, void *user_data) {stream_set_state (stream,BT_BAP_STREAM_STATE_RELEASING ); +stream_set_state (stream,BT_BAP_STREAM_STATE_IDLE );return 1 ; }
Signature · 1 line
2.54.0
Luiz Augusto von Dentz
maintainerPATCH v2 4/4 shared/bap: Use queue_foreach to notify state changes
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
Use queue_foreach to notify state changes since that is considered safer as it does attempt to detect list modification while traversing the list.
--- src/shared/bap.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-)
src/shared/bap.c +20 -17
@@ -1447,10 +1447,19 @@ static bool bap_stream_io_detach(struct bt_bap_stream *stream)return true; } +static void stream_state_changed (void *data,void *user_data) +{ +const struct bt_bap_state *state = data; +struct bt_bap_stream *stream = user_data; + +if (state->func) + state->func (stream, stream->old_state, stream->state, + state->data); +} +static void bap_stream_state_changed (struct bt_bap_stream *stream) {struct bt_bap *bap = stream->bap; -const struct queue_entry *entry;/* Pre notification updates */ switch (stream->ep->state) {
@@ -1475,14 +1484,13 @@ static void bap_stream_state_changed(struct bt_bap_stream *stream)break ; } -for (entry =queue_get_entries (bap->state_cbs); entry; - entry = entry->next) { -struct bt_bap_state *state = entry->data; + stream->old_state = stream->ep->old_state; + stream->state = stream->ep->state; -if (state->func) - state->func (stream, stream->ep->old_state, - stream->ep->state, state->data); - } +/* Notify callbacks using queue_foreach since it does attempt to +* protect against concurrent modifications to the list. +*/ +queue_foreach (bap->state_cbs, stream_state_changed, stream);/* Post notification updates */ switch (stream->ep->state) {
@@ -2407,7 +2415,6 @@ static unsigned int bap_ucast_release(struct bt_bap_stream *stream,static void bap_bcast_set_state (struct bt_bap_stream *stream,uint8_t state) {struct bt_bap *bap = stream->bap; -const struct queue_entry *entry; stream->old_state = stream->state; stream->state = state;
@@ -2419,14 +2426,10 @@ static void bap_bcast_set_state(struct bt_bap_stream *stream, uint8_t state)bt_bap_stream_statestr (stream->old_state), bt_bap_stream_statestr(stream->state)); -for (entry =queue_get_entries (bap->state_cbs); entry; - entry = entry->next) { -struct bt_bap_state *state = entry->data; - -if (state->func) - state->func (stream, stream->old_state, - stream->state, state->data); - } +/* Notify callbacks using queue_foreach since it does attempt to +* protect against concurrent modifications to the list. +*/ +queue_foreach (bap->state_cbs, stream_state_changed, stream);/* Post notification updates */ switch (stream->state) {
Signature · 1 line
2.54.0