From 66dcceb295a063aea7acc3e581298d46f2b79650 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Mon, 7 Dec 2015 15:06:03 +0200 Subject: bluez5: upgrade to 5.36 Backported a fix for a segfault crash. Signed-off-by: Cristian Iorga Signed-off-by: Ross Burton --- meta/recipes-connectivity/bluez5/bluez5.inc | 1 + ...e-Fix-possible-crash-when-registering-pro.patch | 54 ++++++++++++++++++++++ meta/recipes-connectivity/bluez5/bluez5_5.33.bb | 52 --------------------- meta/recipes-connectivity/bluez5/bluez5_5.36.bb | 52 +++++++++++++++++++++ 4 files changed, 107 insertions(+), 52 deletions(-) create mode 100644 meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.33.bb create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.36.bb (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 13fd600296..529d5a66f7 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -18,6 +18,7 @@ PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental," SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ + file://core-profile-Fix-possible-crash-when-registering-pro.patch \ file://init \ " S = "${WORKDIR}/bluez-${PV}" 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 new file mode 100644 index 0000000000..5c6cee1cff --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch @@ -0,0 +1,54 @@ +From bc4dbda3362d3654447d8ae6525cac1540b7d705 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 5 Nov 2015 15:14:50 +0200 +Subject: [PATCH] core/profile: Fix possible crash when registering profiles + +Upstream-Status: Backport + +Profiles under ext_profiles are local and should no be mixed with other +external profiles since its type is different which can may cause invalid +memory when accessing member of ext_profile struct. +--- + src/profile.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/src/profile.c b/src/profile.c +index 49445d7..5a4f09c 100644 +--- a/src/profile.c ++++ b/src/profile.c +@@ -719,19 +719,13 @@ void btd_profile_foreach(void (*func)(struct btd_profile *p, void *data), + + int btd_profile_register(struct btd_profile *profile) + { +- if (profile->external) +- ext_profiles = g_slist_append(ext_profiles, profile); +- else +- profiles = g_slist_append(profiles, profile); ++ profiles = g_slist_append(profiles, profile); + return 0; + } + + void btd_profile_unregister(struct btd_profile *profile) + { +- if (profile->external) +- ext_profiles = g_slist_remove(ext_profiles, profile); +- else +- profiles = g_slist_remove(profiles, profile); ++ profiles = g_slist_remove(profiles, profile); + } + + static struct ext_profile *find_ext_profile(const char *owner, +@@ -742,10 +736,6 @@ static struct ext_profile *find_ext_profile(const char *owner, + for (l = ext_profiles; l != NULL; l = g_slist_next(l)) { + struct ext_profile *ext = l->data; + +- /* +- * Owner and path can be NULL if profile was registered by a +- * plugin using external flag. +- */ + if (g_strcmp0(ext->owner, owner)) + continue; + +-- +2.5.0 + diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.33.bb b/meta/recipes-connectivity/bluez5/bluez5_5.33.bb deleted file mode 100644 index 23c7397e16..0000000000 --- a/meta/recipes-connectivity/bluez5/bluez5_5.33.bb +++ /dev/null @@ -1,52 +0,0 @@ -require bluez5.inc -SRC_URI[md5sum] = "78782dc33d9a8b6344c4cc1af70c8a98" -SRC_URI[sha256sum] = "1801807a13506678cbfeb15c6a4b89ecb5739efe1067eb464da6641d731436d3" - -# noinst programs in Makefile.tools that are conditional on READLINE -# support -NOINST_TOOLS_READLINE ?= " \ - attrib/gatttool \ - tools/obex-client-tool \ - tools/obex-server-tool \ - tools/bluetooth-player \ - tools/obexctl \ -" - -# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL -# support -NOINST_TOOLS_EXPERIMENTAL ?= " \ - emulator/btvirt \ - emulator/b1ee \ - emulator/hfp \ - tools/3dsp \ - tools/mgmt-tester \ - tools/gap-tester \ - tools/l2cap-tester \ - tools/sco-tester \ - tools/smp-tester \ - tools/hci-tester \ - tools/rfcomm-tester \ - tools/bdaddr \ - tools/avinfo \ - tools/avtest \ - tools/scotest \ - tools/amptest \ - tools/hwdb \ - tools/hcieventmask \ - tools/hcisecfilter \ - tools/btmgmt \ - tools/btinfo \ - tools/btattach \ - tools/btsnoop \ - tools/btproxy \ - tools/btiotest \ - tools/mcaptest \ - tools/cltest \ - tools/oobtest \ - tools/seq2bseq \ - tools/ibeacon \ - tools/btgatt-client \ - tools/btgatt-server \ - tools/gatt-service \ - profiles/iap/iapd \ -" diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.36.bb b/meta/recipes-connectivity/bluez5/bluez5_5.36.bb new file mode 100644 index 0000000000..b94ed31def --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5_5.36.bb @@ -0,0 +1,52 @@ +require bluez5.inc +SRC_URI[md5sum] = "9a0ee479cacc44fac68f6a65b1cd3eba" +SRC_URI[sha256sum] = "a343ea1aeb53d3bd139087f3b1c1e1fb70db452d9762cc7a3d23e75962e578f2" + +# noinst programs in Makefile.tools that are conditional on READLINE +# support +NOINST_TOOLS_READLINE ?= " \ + attrib/gatttool \ + tools/obex-client-tool \ + tools/obex-server-tool \ + tools/bluetooth-player \ + tools/obexctl \ +" + +# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL +# support +NOINST_TOOLS_EXPERIMENTAL ?= " \ + emulator/btvirt \ + emulator/b1ee \ + emulator/hfp \ + tools/3dsp \ + tools/mgmt-tester \ + tools/gap-tester \ + tools/l2cap-tester \ + tools/sco-tester \ + tools/smp-tester \ + tools/hci-tester \ + tools/rfcomm-tester \ + tools/bdaddr \ + tools/avinfo \ + tools/avtest \ + tools/scotest \ + tools/amptest \ + tools/hwdb \ + tools/hcieventmask \ + tools/hcisecfilter \ + tools/btmgmt \ + tools/btinfo \ + tools/btattach \ + tools/btsnoop \ + tools/btproxy \ + tools/btiotest \ + tools/mcaptest \ + tools/cltest \ + tools/oobtest \ + tools/seq2bseq \ + tools/ibeacon \ + tools/btgatt-client \ + tools/btgatt-server \ + tools/gatt-service \ + profiles/iap/iapd \ +" -- cgit 1.2.3-korg