67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
|
From 36f057d7f66c62fd01e0cf27cfe816bfd5be5d21 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||
|
|
Date: Tue, 2 Jan 2024 13:02:04 -0500
|
||
|
|
Subject: [PATCH 1/3] audio: transport: Fix crash on A2DP suspend
|
||
|
|
|
||
|
|
Commit 052534ae07b8 ("transport: Update transport release flow for
|
||
|
|
bcast src") introduced a crash where it assumes transport->data always
|
||
|
|
refers to struct bap_transport which causes a crash when the transport
|
||
|
|
is in fact A2DP.
|
||
|
|
|
||
|
|
Fixes: https://github.com/bluez/bluez/issues/701
|
||
|
|
---
|
||
|
|
profiles/audio/transport.c | 16 +++++++++-------
|
||
|
|
1 file changed, 9 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
|
||
|
|
index e2073451c..0c60f06ee 100644
|
||
|
|
--- a/profiles/audio/transport.c
|
||
|
|
+++ b/profiles/audio/transport.c
|
||
|
|
@@ -643,7 +643,6 @@ static DBusMessage *release(DBusConnection *conn, DBusMessage *msg,
|
||
|
|
{
|
||
|
|
struct media_transport *transport = data;
|
||
|
|
struct media_owner *owner = transport->owner;
|
||
|
|
- struct bap_transport *bap = transport->data;
|
||
|
|
const char *sender;
|
||
|
|
struct media_request *req;
|
||
|
|
guint id;
|
||
|
|
@@ -675,11 +674,6 @@ static DBusMessage *release(DBusConnection *conn, DBusMessage *msg,
|
||
|
|
req = media_request_create(msg, id);
|
||
|
|
media_owner_add(owner, req);
|
||
|
|
|
||
|
|
- if (bt_bap_stream_get_type(bap->stream) ==
|
||
|
|
- BT_BAP_STREAM_TYPE_BCAST) {
|
||
|
|
- bap_disable_complete(bap->stream, 0x00, 0x00, owner);
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -1416,6 +1410,7 @@ static guint suspend_bap(struct media_transport *transport,
|
||
|
|
{
|
||
|
|
struct bap_transport *bap = transport->data;
|
||
|
|
bt_bap_stream_func_t func = NULL;
|
||
|
|
+ guint id;
|
||
|
|
|
||
|
|
if (!bap->stream)
|
||
|
|
return 0;
|
||
|
|
@@ -1427,7 +1422,14 @@ static guint suspend_bap(struct media_transport *transport,
|
||
|
|
|
||
|
|
bap_update_links(transport);
|
||
|
|
|
||
|
|
- return bt_bap_stream_disable(bap->stream, bap->linked, func, owner);
|
||
|
|
+ id = bt_bap_stream_disable(bap->stream, bap->linked, func, owner);
|
||
|
|
+
|
||
|
|
+ if (bt_bap_stream_get_type(bap->stream) == BT_BAP_STREAM_TYPE_BCAST) {
|
||
|
|
+ bap_disable_complete(bap->stream, 0x00, 0x00, owner);
|
||
|
|
+ return 0;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return id;
|
||
|
|
}
|
||
|
|
|
||
|
|
static void cancel_bap(struct media_transport *transport, guint id)
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|