pool/bluez
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 590957 from Base:System

Browse Source 
add 0001-Don-t-refresh-adv_manager-for-non-LE-devices.patch (boo#1086731) (forwarded request 590956 from seife)

OBS-URL: https://build.opensuse.org/request/show/590957
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=155
This commit is contained in:
Dominique Leuenberger 2018-03-29 09:50:29 +00:00 committed by Git OBS Bridge
commit a957f35986
3 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
0001-Don-t-refresh-adv_manager-for-non-LE-devices.patch Normal file
View File

@ -0,0 +1,54 @@
From 38269efb4fd130b45275e359c72fc28e3c1e484a Mon Sep 17 00:00:00 2001
From: Antoine Belvire <antoine.belvire@opensuse.org>
Date: Sun, 25 Mar 2018 14:14:28 +0200
Subject: [PATCH] Don't refresh adv_manager for non-LE devices
Commit 91d4b17160 'advertising: Configure discoverable flag based on adapter
settings' introduced a call to btd_adv_manager_refresh upon
MGMT_SETTING_DISCOVERABLE flag change.
But as only LE adapters have an adv_manager, this leads to segmentation fault
for non-LE devices:
0 btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176
1 0x0000556fe45fcb02 in settings_changed (settings=<optimized out>,
adapter=0x556fe53f7c70) at src/adapter.c:543
2 new_settings_callback (index=<optimized out>, length=<optimized out>,
param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573
3 0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0,
status=<optimized out>, opcode=opcode@entry=7, index=index@entry=0,
length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261
4 0x0000556fe462cd9d in can_read_data (io=<optimized out>,
user_data=0x556fe53f20c0) at src/shared/mgmt.c:353
5 0x0000556fe46396e3 in watch_callback (channel=<optimized out>,
cond=<optimized out>, user_data=<optimized out>)
at src/shared/io-glib.c:170
6 0x00007fe351c980e5 in g_main_context_dispatch ()
from /usr/lib64/libglib-2.0.so.0
7 0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0
8 0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0
9 0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>)
at src/main.c:770
This commit prevents the call to btd_adv_manager_refresh for non-LE devices.
---
src/adapter.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/adapter.c b/src/adapter.c
index 6d7d61504..ff51deb62 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -540,7 +540,9 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings)
g_dbus_emit_property_changed(dbus_conn, adapter->path,
ADAPTER_INTERFACE, "Discoverable");
store_adapter_info(adapter);
- btd_adv_manager_refresh(adapter->adv_manager);
+ if (adapter->supported_settings & MGMT_SETTING_LE) {
+ btd_adv_manager_refresh(adapter->adv_manager);
+ }
}
if (changed_mask & MGMT_SETTING_BONDABLE) {
--
2.16.2

6
bluez.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 26 06:04:01 UTC 2018 - seife+obs@b1-systems.com
- add 0001-Don-t-refresh-adv_manager-for-non-LE-devices.patch
(boo#1086731)
-------------------------------------------------------------------
Mon Mar 12 17:44:33 UTC 2018 - seife+obs@b1-systems.com

3
bluez.spec
View File

@ -38,6 +38,8 @@ Patch4: bluez-5.45-disable-broken-tests.diff
Patch5: 0001-obexd-use-AM_LDFLAGS-for-linking.patch
# disable tests for bypass boo#1078285
Patch6: disable_some_obex_tests.patch
# PATCH-FIX-UPSTREAM: crasher bug, boo#1086731 --seife+obs@b1-systems.com
Patch7: 0001-Don-t-refresh-adv_manager-for-non-LE-devices.patch
BuildRequires: automake
BuildRequires: flex
BuildRequires: libtool
@ -145,6 +147,7 @@ desktop specific applets like blueman or GNOME or KDE applets).
%ifarch ppc ppc64 ppc64le
%patch6 -p1
%endif
%patch7 -p1
mkdir dbus-apis
cp -a doc/*.txt dbus-apis/
# FIXME: Change the dbus service to be a real service, not systemd launched