Skip to contentSkip to conversation

AVRCP: Fix crash when no A2DP role is detected

RFC In review Luiz Augusto von Dentz 2 participants 4 messages May 12, 2013 – May 13, 2013 Bluetooth drivers

lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

RFC 1/1 AVRCP: Fix crash when no A2DP role is detected

From: Luiz Augusto von Dentz <[email protected]>

Invalid read of size 4
at 0x468370: btd_service_connecting_complete (service.c:315)
by 0x41B70F: session_ct_init_control (avrcp.c:2790)
by 0x41B1E0: state_changed (avrcp.c:2933)
by 0x418054: avctp_set_state (avctp.c:548)
by 0x41A2E4: avctp_connect_cb (avctp.c:1201)
by 0x44F989: accept_cb (btio.c:201)
by 0x4E77044: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x4E77377: g_main_context_iterate.isra.24 (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x4E77771: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x40A8EE: main (main.c:583)
Address 0x20 is not stack'd, malloc'd or (recently) free'd

If no A2DP is found assume the controller is the initiator.

---
 profiles/audio/avctp.c | 7 +++++++
 profiles/audio/avctp.h | 1 +
 profiles/audio/avrcp.c | 7 ++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)
profiles/audio/avctp.c +7 -0
index db03456..314dbfb 100644
@@ -201,6 +201,7 @@ struct avctp {
 
 	uint8_t key_quirks[256];
 	struct key_pressed key;
+	bool initiator;
 };
 
 struct avctp_passthrough_handler {
@@ -1931,6 +1932,7 @@ struct avctp *avctp_connect(struct audio_device *device)
 	}
 
 	session->control = avctp_channel_create(session, io, NULL);
+	session->initiator = true;
 	g_io_channel_unref(io);
 
 	return session;
@@ -1983,3 +1985,8 @@ struct avctp *avctp_get(struct audio_device *device)
 {
 	return avctp_get_internal(device->btd_dev);
 }
+
+bool avctp_is_initiator(struct avctp *session)
+{
+	return session->initiator;
+}
profiles/audio/avctp.h +1 -0
index 0a414af..cd575cc 100644
@@ -120,6 +120,7 @@ void avctp_unregister(struct btd_adapter *adapter);
 
 struct avctp *avctp_connect(struct audio_device *device);
 struct avctp *avctp_get(struct audio_device *device);
+bool avctp_is_initiator(struct avctp *session);
 int avctp_connect_browsing(struct avctp *session);
 void avctp_disconnect(struct avctp *session);
 
profiles/audio/avrcp.c +6 -1
index 4acf396..4558407 100644
@@ -2863,7 +2863,12 @@ static struct avrcp *session_create(struct avrcp_server *server,
 
 	server->sessions = g_slist_append(server->sessions, session);
 
-	if (dev->sink && !dev->source)
+	/* If sink and source are not supported assume the controller must
+	 * be the initiator
+	 */
+	if (dev->sink == NULL && dev->source == NULL)
+		session->target = !avctp_is_initiator(session->conn);
+	else if (dev->sink && !dev->source)
 		session->target = TRUE;
 	else if (dev->source && !dev->sink)
 		session->target = FALSE;
Signature · 1 line
1.8.1.4
#1 lore raw

Hi Luiz,

Quoted 15 lines · Luiz Augusto von Dentz

From: Luiz Augusto von Dentz <[email protected]>

Invalid read of size 4
at 0x468370: btd_service_connecting_complete (service.c:315)
by 0x41B70F: session_ct_init_control (avrcp.c:2790)
by 0x41B1E0: state_changed (avrcp.c:2933)
by 0x418054: avctp_set_state (avctp.c:548)
by 0x41A2E4: avctp_connect_cb (avctp.c:1201)
by 0x44F989: accept_cb (btio.c:201)
by 0x4E77044: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x4E77377: g_main_context_iterate.isra.24 (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x4E77771: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x40A8EE: main (main.c:583)
Address 0x20 is not stack'd, malloc'd or (recently) free'd

Quoted 1 line

If no A2DP is found assume the controller is the initiator.

This patch indeed fixes the crash. Ack.

Cheers,

Signature · 1 line
Vinicius
author maintainer
#2 lore raw

Hi Vinicius,

Quoted 18 lines · Vinicius Costa Gomes

Hi Luiz,

Quoted 15 lines · Luiz Augusto von Dentz

From: Luiz Augusto von Dentz <[email protected]>

Invalid read of size 4
at 0x468370: btd_service_connecting_complete (service.c:315)
by 0x41B70F: session_ct_init_control (avrcp.c:2790)
by 0x41B1E0: state_changed (avrcp.c:2933)
by 0x418054: avctp_set_state (avctp.c:548)
by 0x41A2E4: avctp_connect_cb (avctp.c:1201)
by 0x44F989: accept_cb (btio.c:201)
by 0x4E77044: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x4E77377: g_main_context_iterate.isra.24 (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x4E77771: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x40A8EE: main (main.c:583)
Address 0x20 is not stack'd, malloc'd or (recently) free'd

Quoted 4 lines
Quoted 1 line

If no A2DP is found assume the controller is the initiator.

This patch indeed fixes the crash. Ack.

We were discussing about this problem offline, it doesn't seems very clear how we end up with control being NULL like this and it is desirable to have such information in the description because perhaps we are fixing this in the wrong place after all. Can you explain how exactly you managed to reproduced the problem?

--
Luiz Augusto von Dentz

#3 lore raw

Hi Luiz,

Quoted 25 lines · Luiz Augusto von Dentz

Hi Vinicius,

Quoted 21 lines · Vinicius Costa Gomes

Hi Luiz,

Quoted 16 lines · Luiz Augusto von Dentz

From: Luiz Augusto von Dentz <[email protected]>

Invalid read of size 4
at 0x468370: btd_service_connecting_complete (service.c:315)
by 0x41B70F: session_ct_init_control (avrcp.c:2790)
by 0x41B1E0: state_changed (avrcp.c:2933)
by 0x418054: avctp_set_state (avctp.c:548)
by 0x41A2E4: avctp_connect_cb (avctp.c:1201)
by 0x44F989: accept_cb (btio.c:201)
by 0x4E77044: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x4E77377: g_main_context_iterate.isra.24 (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x4E77771: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.3400.2) by 0x40A8EE: main (main.c:583)
Address 0x20 is not stack'd, malloc'd or (recently) free'd

If no A2DP is found assume the controller is the initiator.

Quoted 7 lines
Quoted 1 line

This patch indeed fixes the crash. Ack.

We were discussing about this problem offline, it doesn't seems very clear how we end up with control being NULL like this and it is desirable to have such information in the description because perhaps we are fixing this in the wrong place after all. Can you explain how exactly you managed to reproduced the problem?

The issue is not that control is NULL. 'btd_sevice_connecting_complete()' gets called from profiles/audio/control.c:73 with control->target being NULL. The interesting point is that control->remote is valid. This makes the point that the wrong function may be set to session->init_control(). Which brings the question "how?". Seems that in my case (BlueZ vs. BlueZ) with no A2DP Endpoint registered (dev->sink and dev->source are NULL), the wrong AVRCP role gets selected around profiles/audio/avrcp.c:2873 .

Your patch makes this role selection find the correct one.

Quoted 4 lines

--
Luiz Augusto von Dentz

Cheers,

Signature · 1 line
Vinicius