On 07/17/2012 10:06 AM, Andrei Gherzan wrote:
From: Ross Burton <[email protected]>
It appears that when there is no existing connman state there is memory
corruption which causes free() on MIPS/PPC to abort.
Signed-off-by: Ross Burton <[email protected]>
---
...ck-that-the-string-isn-t-empty-before-spl.patch | 37 ++++++++++++++++++++
meta/recipes-connectivity/connman/connman_1.3.bb | 5 +--
2 files changed, 40 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-connectivity/connman/connman/0001-storage-check-that-the-string-isn-t-empty-before-spl.patch
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
new file mode 100644
index 0000000..c92b586
--- /dev/null
+++
b/meta/recipes-connectivity/connman/connman/0001-storage-check-that-the-string-isn-t-empty-before-spl.patch
@@ -0,0 +1,37 @@
+From ea8c7b3efce4c1762411e073893e948de5d552d6 Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+Date: Tue, 17 Jul 2012 16:04:12 +0100
+Subject: [PATCH] storage: check that the string isn't empty before splitting
+
+If the string was non-NULL but empty (str="\0"), the following \0 assignment
+would write to str[-1] and thus cause memory corruption.
+
+On PPC and MIPS, this was causing crashes in glibc.
+
+Signed-off-by: Ross Burton <[email protected]>
+Upstream-Status: Submitted
+
+---
+ src/storage.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/storage.c b/src/storage.c
+index 47bd0cb..20766a3 100644
+--- a/src/storage.c
++++ b/src/storage.c
+@@ -212,7 +212,11 @@ gchar **connman_storage_get_services()
+ closedir(dir);
+
+ str = g_string_free(result, FALSE);
+- if (str) {
++ if (str && str[0] != '\0') {
++ /*
++ * Remove the trailing separator so that services doesn't end up
++ * with an empty element.
++ */
+ str[strlen(str) - 1] = '\0';
+ services = g_strsplit(str, "/", -1);
+ }
+--
+1.7.10.4
+
diff --git a/meta/recipes-connectivity/connman/connman_1.3.bb
b/meta/recipes-connectivity/connman/connman_1.3.bb
index a98b46c..1e3ee56 100644
--- a/meta/recipes-connectivity/connman/connman_1.3.bb
+++ b/meta/recipes-connectivity/connman/connman_1.3.bb
@@ -7,6 +7,7 @@ SRC_URI =
"git://git.kernel.org/pub/scm/network/connman/connman.git \
file://add_xuser_dbus_permission.patch \
file://connman \
file://0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch \
-
file://0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch"
+
file://0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch \
+ file://storage-check-that-the-string-isn-t-empty-before-spl.patch"
Patch name here does not match the filename created above!
Sau!
S = "${WORKDIR}/git"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
