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

[Andreas Radke]

    Date: Friday, March 25, 2016 @ 11:17:38
  Author: andyrtr
Revision: 262520

upgpkg: bluez 5.38-2

add upstream fix for FS#48644

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

-----------------------------------------------+
 PKGBUILD                                      |   14 +++++++--
 fix_crash_when_connecting_to_controllers.diff |   37 ++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-25 10:02:14 UTC (rev 262519)
+++ PKGBUILD	2016-03-25 10:17:38 UTC (rev 262520)
@@ -6,19 +6,27 @@
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
 pkgver=5.38
-pkgrel=1
+pkgrel=2
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('dbus' 'libical' 'systemd')
 source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
-        bluetooth.modprobe)
+        bluetooth.modprobe
+        fix_crash_when_connecting_to_controllers.diff)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
 sha256sums=('0618c5440be6715805060ab5eea930526f34089c437bf61819447b160254f4df'
             'SKIP'
-            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
+            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
+            '27296fb6cce5e62a04fbeb0779d852995779ecef553cc2e692d91d89eff8c673')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # FS#48644, http://git.kernel.org/cgit/bluetooth/bluez.git/commit/?id=177d27c8c3db4588ec13dae0368f240902c42825
+  patch -Np1 -i ${srcdir}/fix_crash_when_connecting_to_controllers.diff
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure \

Added: fix_crash_when_connecting_to_controllers.diff
===================================================================
--- fix_crash_when_connecting_to_controllers.diff	                        (rev 0)
+++ fix_crash_when_connecting_to_controllers.diff	2016-03-25 10:17:38 UTC (rev 262520)
@@ -0,0 +1,37 @@
+From 177d27c8c3db4588ec13dae0368f240902c42825 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
+Date: Tue, 22 Mar 2016 17:37:18 +0200
+Subject: audio/avrcp: Fix crash when connecting to controllers
+
+Patch 70fdb77d0af137aa859f267da976f610cd9bbbd2 has actually caused the
+following regression since no player is set:
+
+Invalid read of size 8
+  at 0x435B8E: avrcp_player_value_rsp (avrcp.c:2150)
+  by 0x42FB83: control_response (avctp.c:831)
+  by 0x42FB83: session_cb (avctp.c:996)
+  by 0x50C8E39: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.4600.2)
+  by 0x50C91CF: ??? (in /usr/lib64/libglib-2.0.so.0.4600.2)
+  by 0x50C94F1: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.4600.2)
+  by 0x40C258: main (main.c:687)
+Address 0x58 is not stack'd, malloc'd or (recently) free'd
+---
+ profiles/audio/avrcp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
+index 787643c..0c6279a 100644
+--- a/profiles/audio/avrcp.c
++++ b/profiles/audio/avrcp.c
+@@ -3656,7 +3656,7 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
+ 		}
+ 	}
+ 
+-	if (!session->controller)
++	if (!session->controller || !session->controller->player)
+ 		return FALSE;
+ 
+ 	if (!(events & (1 << AVRCP_EVENT_SETTINGS_CHANGED)))
+-- 
+cgit v0.12
+