diff options
Diffstat (limited to 'source/n/bluez')
| -rwxr-xr-x | source/n/bluez/bluez.SlackBuild | 3 | ||||
| -rw-r--r-- | source/n/bluez/gatt_fix_crash.diff | 43 |
2 files changed, 1 insertions, 45 deletions
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild index 8fc07365c..94a407d4a 100755 --- a/source/n/bluez/bluez.SlackBuild +++ b/source/n/bluez/bluez.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bluez VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -79,7 +79,6 @@ find . \ zcat $CWD/bluez-5.30-obexd_without_systemd-1.patch.gz | patch -p1 --verbose || exit 1 # Fix bluetoothd crashes: -zcat $CWD/gatt_fix_crash.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/refresh_adv_manager_for_non-LE_devices.diff.gz | patch -p1 --verbose || exit 1 autoreconf -vif diff --git a/source/n/bluez/gatt_fix_crash.diff b/source/n/bluez/gatt_fix_crash.diff deleted file mode 100644 index d05785252..000000000 --- a/source/n/bluez/gatt_fix_crash.diff +++ /dev/null @@ -1,43 +0,0 @@ -From e10c204e1226e94a1eaaeaee076e7e2e5b13c504 Mon Sep 17 00:00:00 2001 -From: Szymon Janc <szymon.janc@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 - - |