From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- source/n/bluez/gatt_fix_crash.diff | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 source/n/bluez/gatt_fix_crash.diff (limited to 'source/n/bluez/gatt_fix_crash.diff') diff --git a/source/n/bluez/gatt_fix_crash.diff b/source/n/bluez/gatt_fix_crash.diff new file mode 100644 index 000000000..d05785252 --- /dev/null +++ b/source/n/bluez/gatt_fix_crash.diff @@ -0,0 +1,43 @@ +From e10c204e1226e94a1eaaeaee076e7e2e5b13c504 Mon Sep 17 00:00:00 2001 +From: Szymon Janc +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 + + -- cgit v1.2.3-65-gdbad