Accepting request 238871 from home:seife:testing

update to version 5.20

OBS-URL: https://build.opensuse.org/request/show/238871
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=168
This commit is contained in:
Stephan Kulow 2014-07-03 04:55:43 +00:00 committed by Git OBS Bridge
parent f5d3ee6535
commit cd754159f2
5 changed files with 80 additions and 4 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12778f3b66e71eec50eeb2e652de94a2578f33b8c8bd57c981fa00adab524c8a
size 1343284

View File

@ -0,0 +1,60 @@
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ] shared/queue: Fix invalid read
Date: Fri, 27 Jun 2014 13:47:49 +0300
Message-Id: <1403866069-15394-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
If the queue elements are destroyed by queue_destroy the head will point
to freed memory causing the following error when unit/test-queue is run:
Invalid read of size 8
at 0x401040: queue_foreach (queue.c:194)
by 0x4E9E5E0: ??? (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x4E9E7A5: ??? (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x4E9EB1A: g_test_run_suite (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x40083E: main (test-queue.c:109)
Address 0x7f65738 is 8 bytes inside a block of size 16 free'd
at 0x4C28577: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x400E29: queue_destroy (queue.c:93)
by 0x40102C: queue_foreach (queue.c:219)
by 0x4E9E5E0: ??? (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x4E9E7A5: ??? (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x4E9EB1A: g_test_run_suite (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x40083E: main (test-queue.c:109)
---
src/shared/queue.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/src/shared/queue.c b/src/shared/queue.c
index 4013293..3bdc1ec 100644
--- a/src/shared/queue.c
+++ b/src/shared/queue.c
@@ -75,23 +75,10 @@ struct queue *queue_new(void)
void queue_destroy(struct queue *queue, queue_destroy_func_t destroy)
{
- struct queue_entry *entry;
-
if (!queue)
return;
- entry = queue->head;
-
- while (entry) {
- struct queue_entry *tmp = entry;
-
- if (destroy)
- destroy(entry->data);
-
- entry = entry->next;
-
- free(tmp);
- }
+ queue_remove_all(queue, NULL, NULL, destroy);
queue_unref(queue);
}
--
1.9.3

3
bluez-5.20.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:531fbaa0a9baf7b1f76fb8fd8975c20d3cc61cdc772a39d63df1d6abfc2a7481
size 1368176

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Jun 27 10:56:22 UTC 2014 - seife+obs@b1-systems.com
- add bluez-5.20-fix-queue.patch to fix test case failure
-------------------------------------------------------------------
Sat Jun 21 21:30:12 UTC 2014 - seife+obs@b1-systems.com
- update to version 5.20
For non-Android related parts this is mostly a bug-fix release
with minor fixes here and there as well as improved handling of
PS3 controllers.
-------------------------------------------------------------------
Tue May 20 06:24:05 UTC 2014 - seife+obs@b1-systems.com

View File

@ -24,7 +24,7 @@ BuildRequires: libcap-ng-devel
BuildRequires: systemd-devel
BuildRequires: pkgconfig(dbus-1) >= 1.4
%{?systemd_requires}
Version: 5.19
Version: 5.20
Release: 0
Summary: Bluetooth Stack for Linux
License: GPL-2.0+
@ -38,6 +38,8 @@ Source99: README.packagers
# fix some logitech HID devices, bnc#681049, bnc#850478 --seife+obs@b1-systems.com
Patch1: bluez-5.11-logitech-hid2hci.patch
Patch2: bluez-sdp-unix-path.patch
# PATCH-FIX-UPSTREAM bluez-5.20-fix-queue.patch fix testcase failure (and broken code :-) --seife
Patch100: bluez-5.20-fix-queue.patch
BuildRequires: alsa-devel
BuildRequires: automake
BuildRequires: check-devel
@ -113,6 +115,7 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
%setup -q
%patch1 -p1
%patch2 -p1
%patch100 -p1
cp %{SOURCE6} .
mkdir dbus-apis
cp -a doc/*.txt dbus-apis/