Blame SOURCES/0001-adapter-Don-t-refresh-adv_manager-for-non-LE-devices.patch

ab4cc4
From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001
ab4cc4
From: "antoine.belvire@laposte.net" <antoine.belvire@laposte.net>
ab4cc4
Date: Tue, 27 Mar 2018 20:30:26 +0200
ab4cc4
Subject: [PATCH] adapter: Don't refresh adv_manager for non-LE devices
ab4cc4
ab4cc4
btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change
ab4cc4
but as only LE adapters have an adv_manager, this leads to segmentation fault
ab4cc4
for non-LE devices:
ab4cc4
ab4cc4
0  btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
ab4cc4
1  0x0000556fe45fcb02 in settings_changed (settings=<optimized out>,
ab4cc4
    adapter=0x556fe53f7c70) at src/adapter.c:543
ab4cc4
2  new_settings_callback (index=<optimized out>, length=<optimized out>,
ab4cc4
    param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
ab4cc4
3  0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0,
ab4cc4
    status=<optimized out>, opcode=opcode@entry=7, index=index@entry=0,
ab4cc4
    length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
ab4cc4
4  0x0000556fe462cd9d in can_read_data (io=<optimized out>,
ab4cc4
    user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
ab4cc4
5  0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
ab4cc4
    cond=<optimized out>, user_data=<optimized out>)
ab4cc4
    at src/shared/io-glib.c:170
ab4cc4
6  0x00007fe351c980e5 in g_main_context_dispatch ()
ab4cc4
   from /usr/lib64/libglib-2.0.so.0
ab4cc4
7  0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
ab4cc4
8  0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
ab4cc4
9  0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>)
ab4cc4
    at src/main.c:770
ab4cc4
ab4cc4
This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
ab4cc4
---
ab4cc4
 src/adapter.c | 3 ++-
ab4cc4
 1 file changed, 2 insertions(+), 1 deletion(-)
ab4cc4
ab4cc4
diff --git a/src/adapter.c b/src/adapter.c
ab4cc4
index 6b9222bcf..daccfdc19 100644
ab4cc4
--- a/src/adapter.c
ab4cc4
+++ b/src/adapter.c
ab4cc4
@@ -540,7 +540,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
ab4cc4
 		g_dbus_emit_property_changed(dbus_conn, adapter->path,
ab4cc4
 					ADAPTER_INTERFACE, "Discoverable");
ab4cc4
 		store_adapter_info(adapter);
ab4cc4
-		btd_adv_manager_refresh(adapter->adv_manager);
ab4cc4
+		if (adapter->supported_settings & MGMT_SETTING_LE)
ab4cc4
+			btd_adv_manager_refresh(adapter->adv_manager);
ab4cc4
 	}
ab4cc4
 
ab4cc4
 	if (changed_mask & MGMT_SETTING_BONDABLE) {
ab4cc4
-- 
ab4cc4
2.17.0
ab4cc4