Merge pull request #17303 from CarlosDerSeher/feature_bt_agent
[feed/packages.git] / utils / bluez / patches / 205-refresh_adv_manager_for_non-LE_devices.patch
1 From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001
2 From: "antoine.belvire@laposte.net" <antoine.belvire@laposte.net>
3 Date: Tue, 27 Mar 2018 20:30:26 +0200
4 Subject: adapter: Don't refresh adv_manager for non-LE devices
5
6 btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change
7 but as only LE adapters have an adv_manager, this leads to segmentation fault
8 for non-LE devices:
9
10 0 btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
11 1 0x0000556fe45fcb02 in settings_changed (settings=<optimized out>,
12 adapter=0x556fe53f7c70) at src/adapter.c:543
13 2 new_settings_callback (index=<optimized out>, length=<optimized out>,
14 param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
15 3 0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0,
16 status=<optimized out>, opcode=opcode@entry=7, index=index@entry=0,
17 length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
18 4 0x0000556fe462cd9d in can_read_data (io=<optimized out>,
19 user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
20 5 0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
21 cond=<optimized out>, user_data=<optimized out>)
22 at src/shared/io-glib.c:170
23 6 0x00007fe351c980e5 in g_main_context_dispatch ()
24 from /usr/lib64/libglib-2.0.so.0
25 7 0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
26 8 0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
27 9 0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>)
28 at src/main.c:770
29
30 This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
31 ---
32 src/adapter.c | 3 ++-
33 1 file changed, 2 insertions(+), 1 deletion(-)
34
35 --- a/src/adapter.c
36 +++ b/src/adapter.c
37 @@ -606,7 +606,9 @@ static void settings_changed(struct btd_
38 */
39 if (!adapter->discovery_discoverable)
40 store_adapter_info(adapter);
41 - btd_adv_manager_refresh(adapter->adv_manager);
42 +
43 + if (adapter->supported_settings & MGMT_SETTING_LE)
44 + btd_adv_manager_refresh(adapter->adv_manager);
45 }
46
47 if (changed_mask & MGMT_SETTING_BONDABLE) {