[arch-commits] Commit in bluez/trunk (PKGBUILD gatt_fix_crash.diff)

[Andreas Radke]

    Date: Wednesday, April 4, 2018 @ 12:06:57
  Author: andyrtr
Revision: 320928

upgpkg: bluez 5.49-2

-l

Added:
  bluez/trunk/gatt_fix_crash.diff
Modified:
  bluez/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   13 ++++++++++---
 gatt_fix_crash.diff |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-04 08:01:20 UTC (rev 320927)
+++ PKGBUILD	2018-04-04 12:06:57 UTC (rev 320928)
@@ -6,19 +6,26 @@
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
 pkgver=5.49
-pkgrel=1
+pkgrel=2
 url="http://www.bluez.org/"
 arch=('x86_64')
 license=('GPL2')
 makedepends=('dbus' 'libical' 'systemd' 'alsa-lib')
 source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
-        bluetooth.modprobe)
+        bluetooth.modprobe
+        gatt_fix_crash.diff)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
 sha256sums=('33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95'
             'SKIP'
-            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
+            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
+            'f40030e01136271e8009cc322c584369ed1101a5710a48509d89079606b6d666')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../gatt_fix_crash.diff
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure \

Added: gatt_fix_crash.diff
===================================================================
--- gatt_fix_crash.diff	                        (rev 0)
+++ gatt_fix_crash.diff	2018-04-04 12:06:57 UTC (rev 320928)
@@ -0,0 +1,43 @@
+From e10c204e1226e94a1eaaeaee076e7e2e5b13c504 Mon Sep 17 00:00:00 2001
+From: Szymon Janc <szymon.janc at codecoup.pl>
+Date: Wed, 4 Apr 2018 09:28:56 +0200
+Subject: gatt: Fix crash with BR/EDR only adapter
+
+adapter->database can be NULL if controller is BR/EDR only or LE was
+disabled. Make btd_gatt_database_restore_svc_chng_ccc accept NULL
+pointer and silently ignore it similiar to rest of btd_gatt_database
+API.
+
+Invalid read of size 8
+   at 0x164DCB: btd_gatt_database_restore_svc_chng_ccc (src/bluez-git/src/bluetoothd)
+   by 0x17B70F: read_info_complete (src/bluez-git/src/bluetoothd)
+   by 0x1A7E58: request_complete (src/bluez-git/src/bluetoothd)
+   by 0x1A89AD: can_read_data (src/bluez-git/src/bluetoothd)
+   by 0x1B5752: watch_callback (src/bluez-git/src/bluetoothd)
+   by 0x4E852C5: g_main_context_dispatch (in /usr/lib/libglib-2.0.so.0.5600.0)
+   by 0x4E856A0: ??? (in /usr/lib/libglib-2.0.so.0.5600.0)
+   by 0x4E859D1: g_main_loop_run (in /usr/lib/libglib-2.0.so.0.5600.0)
+   by 0x125058: main (src/bluez-git/src/bluetoothd)
+ Address 0x40 is not stack'd, malloc'd or (recently) free'd
+---
+ src/gatt-database.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/gatt-database.c b/src/gatt-database.c
+index 1cdc72e..0ac5b75 100644
+--- a/src/gatt-database.c
++++ b/src/gatt-database.c
+@@ -3330,6 +3330,9 @@ void btd_gatt_database_restore_svc_chng_ccc(struct btd_gatt_database *database)
+ 	uint8_t value[4];
+ 	uint16_t handle, ccc_handle;
+ 
++	if (!database)
++		return;
++
+ 	handle = gatt_db_attribute_get_handle(database->svc_chngd);
+ 	ccc_handle = gatt_db_attribute_get_handle(database->svc_chngd_ccc);
+ 
+-- 
+cgit v1.1
+
+