summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-08-17 16:10:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 09:45:58 (GMT)
commit9e36b4f21b5b73dc75382258102cc1575886c88d (patch)
tree3267ee7b62de201f4a0b0f396e2e254a8cd3947c /meta/recipes-connectivity
parent488970dcab84e106e068a5d3e8e62b3a089d02a3 (diff)
downloadpoky-9e36b4f21b5b73dc75382258102cc1575886c88d.tar.gz
connman: upgrade to 1.4
The removed patch is included in connman 1.4. (From OE-Core rev: a1f16a0f3a015628f3d2d02d980311537a3a2c00) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman/0001-storage-check-that-the-string-isn-t-empty-before-spl.patch37
-rw-r--r--meta/recipes-connectivity/connman/connman_1.4.bb (renamed from meta/recipes-connectivity/connman/connman_1.3.bb)9
2 files changed, 4 insertions, 42 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0001-storage-check-that-the-string-isn-t-empty-before-spl.patch b/meta/recipes-connectivity/connman/connman/0001-storage-check-that-the-string-isn-t-empty-before-spl.patch
deleted file mode 100644
index c92b586..0000000
--- a/meta/recipes-connectivity/connman/connman/0001-storage-check-that-the-string-isn-t-empty-before-spl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From ea8c7b3efce4c1762411e073893e948de5d552d6 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 17 Jul 2012 16:04:12 +0100
4Subject: [PATCH] storage: check that the string isn't empty before splitting
5
6If the string was non-NULL but empty (str="\0"), the following \0 assignment
7would write to str[-1] and thus cause memory corruption.
8
9On PPC and MIPS, this was causing crashes in glibc.
10
11Signed-off-by: Ross Burton <ross.burton@intel.com>
12Upstream-Status: Submitted
13
14---
15 src/storage.c | 6 +++++-
16 1 file changed, 5 insertions(+), 1 deletion(-)
17
18diff --git a/src/storage.c b/src/storage.c
19index 47bd0cb..20766a3 100644
20--- a/src/storage.c
21+++ b/src/storage.c
22@@ -212,7 +212,11 @@ gchar **connman_storage_get_services()
23 closedir(dir);
24
25 str = g_string_free(result, FALSE);
26- if (str) {
27+ if (str && str[0] != '\0') {
28+ /*
29+ * Remove the trailing separator so that services doesn't end up
30+ * with an empty element.
31+ */
32 str[strlen(str) - 1] = '\0';
33 services = g_strsplit(str, "/", -1);
34 }
35--
361.7.10.4
37
diff --git a/meta/recipes-connectivity/connman/connman_1.3.bb b/meta/recipes-connectivity/connman/connman_1.4.bb
index 4d82794..bd8ba65 100644
--- a/meta/recipes-connectivity/connman/connman_1.3.bb
+++ b/meta/recipes-connectivity/connman/connman_1.4.bb
@@ -1,13 +1,12 @@
1require connman.inc 1require connman.inc
2 2
3# 1.3 tag 3# 1.4 tag
4SRCREV = "3c0fa84091524c7cd6237744f2088ffee2f1d5ad" 4SRCREV = "f701bbca259f1f35e68d338f31f5373f75f3da5f"
5SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ 5SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
6 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 6 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
7 file://add_xuser_dbus_permission.patch \ 7 file://add_xuser_dbus_permission.patch \
8 file://connman \ 8 file://connman \
9 file://0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch \ 9 file://0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch \
10 file://0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch \ 10 file://0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch"
11 file://0001-storage-check-that-the-string-isn-t-empty-before-spl.patch"
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
13PR = "${INC_PR}.2" 12PR = "${INC_PR}.0"