summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc2
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch54
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5_5.37.bb (renamed from meta/recipes-connectivity/bluez5/bluez5_5.36.bb)7
3 files changed, 5 insertions, 58 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 3aaefa366c..ff2bdcba62 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -22,7 +22,7 @@ SRC_URI = "\
22" 22"
23S = "${WORKDIR}/bluez-${PV}" 23S = "${WORKDIR}/bluez-${PV}"
24 24
25inherit autotools-brokensep pkgconfig systemd update-rc.d 25inherit autotools-brokensep pkgconfig systemd update-rc.d distro_features_check
26 26
27EXTRA_OECONF = "\ 27EXTRA_OECONF = "\
28 --enable-tools \ 28 --enable-tools \
diff --git a/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch b/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch
deleted file mode 100644
index 5c6cee1cff..0000000000
--- a/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From bc4dbda3362d3654447d8ae6525cac1540b7d705 Mon Sep 17 00:00:00 2001
2From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
3Date: Thu, 5 Nov 2015 15:14:50 +0200
4Subject: [PATCH] core/profile: Fix possible crash when registering profiles
5
6Upstream-Status: Backport
7
8Profiles under ext_profiles are local and should no be mixed with other
9external profiles since its type is different which can may cause invalid
10memory when accessing member of ext_profile struct.
11---
12 src/profile.c | 14 ++------------
13 1 file changed, 2 insertions(+), 12 deletions(-)
14
15diff --git a/src/profile.c b/src/profile.c
16index 49445d7..5a4f09c 100644
17--- a/src/profile.c
18+++ b/src/profile.c
19@@ -719,19 +719,13 @@ void btd_profile_foreach(void (*func)(struct btd_profile *p, void *data),
20
21 int btd_profile_register(struct btd_profile *profile)
22 {
23- if (profile->external)
24- ext_profiles = g_slist_append(ext_profiles, profile);
25- else
26- profiles = g_slist_append(profiles, profile);
27+ profiles = g_slist_append(profiles, profile);
28 return 0;
29 }
30
31 void btd_profile_unregister(struct btd_profile *profile)
32 {
33- if (profile->external)
34- ext_profiles = g_slist_remove(ext_profiles, profile);
35- else
36- profiles = g_slist_remove(profiles, profile);
37+ profiles = g_slist_remove(profiles, profile);
38 }
39
40 static struct ext_profile *find_ext_profile(const char *owner,
41@@ -742,10 +736,6 @@ static struct ext_profile *find_ext_profile(const char *owner,
42 for (l = ext_profiles; l != NULL; l = g_slist_next(l)) {
43 struct ext_profile *ext = l->data;
44
45- /*
46- * Owner and path can be NULL if profile was registered by a
47- * plugin using external flag.
48- */
49 if (g_strcmp0(ext->owner, owner))
50 continue;
51
52--
532.5.0
54
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.36.bb b/meta/recipes-connectivity/bluez5/bluez5_5.37.bb
index 884bb7760e..db20f79ffa 100644
--- a/meta/recipes-connectivity/bluez5/bluez5_5.36.bb
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.37.bb
@@ -1,8 +1,9 @@
1require bluez5.inc 1require bluez5.inc
2 2
3SRC_URI += "file://core-profile-Fix-possible-crash-when-registering-pro.patch" 3REQUIRED_DISTRO_FEATURES = "bluez5"
4SRC_URI[md5sum] = "9a0ee479cacc44fac68f6a65b1cd3eba" 4
5SRC_URI[sha256sum] = "a343ea1aeb53d3bd139087f3b1c1e1fb70db452d9762cc7a3d23e75962e578f2" 5SRC_URI[md5sum] = "33177e5743e24b2b3738f72be64e3ffb"
6SRC_URI[sha256sum] = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0"
6 7
7# noinst programs in Makefile.tools that are conditional on READLINE 8# noinst programs in Makefile.tools that are conditional on READLINE
8# support 9# support