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