[arch-commits] Commit in bluez/trunk (2 files)

[Andreas Radke]

    Date: Thursday, April 5, 2018 @ 17:41:45
  Author: andyrtr
Revision: 320978

upgpkg: bluez 5.49-3

apply another upstream fix for some crashes, FS#53442

Added:
  bluez/trunk/refresh_adv_manager_for_non-LE_devices.diff
Modified:
  bluez/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |    5 ++
 refresh_adv_manager_for_non-LE_devices.diff |   52 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-05 17:36:59 UTC (rev 320977)
+++ PKGBUILD	2018-04-05 17:41:45 UTC (rev 320978)
@@ -6,7 +6,7 @@
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
 pkgver=5.49
-pkgrel=2
+pkgrel=3
 url="http://www.bluez.org/"
 arch=('x86_64')
 license=('GPL2')
@@ -13,16 +13,19 @@
 makedepends=('dbus' 'libical' 'systemd' 'alsa-lib')
 source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
         bluetooth.modprobe
+        refresh_adv_manager_for_non-LE_devices.diff
         gatt_fix_crash.diff)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
 sha256sums=('33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95'
             'SKIP'
             '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
+            'ae195834cdc9d3d1961ae3c49da6381c820883a5af580e61aebed05a3e911d48'
             'f40030e01136271e8009cc322c584369ed1101a5710a48509d89079606b6d666')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../refresh_adv_manager_for_non-LE_devices.diff
   patch -Np1 -i ../gatt_fix_crash.diff
 }
 

Added: refresh_adv_manager_for_non-LE_devices.diff
===================================================================
--- refresh_adv_manager_for_non-LE_devices.diff	                        (rev 0)
+++ refresh_adv_manager_for_non-LE_devices.diff	2018-04-05 17:41:45 UTC (rev 320978)
@@ -0,0 +1,52 @@
+From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001
+From: "antoine.belvire at laposte.net" <antoine.belvire at laposte.net>
+Date: Tue, 27 Mar 2018 20:30:26 +0200
+Subject: adapter: Don't refresh adv_manager for non-LE devices
+
+btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting 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 at entry=0x556fe53f20c0,
+    status=<optimized out>, opcode=opcode at entry=7, index=index at entry=0,
+    length=length at 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 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/adapter.c b/src/adapter.c
+index 6b9222b..daccfdc 100644
+--- a/src/adapter.c
++++ b/src/adapter.c
+@@ -540,7 +540,8 @@ 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) {
+-- 
+cgit v1.1
+
+