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>
This commit is contained in:
parent
488970dcab
commit
9e36b4f21b
|
@ -1,37 +0,0 @@
|
|||
From ea8c7b3efce4c1762411e073893e948de5d552d6 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
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 <ross.burton@intel.com>
|
||||
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
|
||||
|
|
@ -1,13 +1,12 @@
|
|||
require connman.inc
|
||||
|
||||
# 1.3 tag
|
||||
SRCREV = "3c0fa84091524c7cd6237744f2088ffee2f1d5ad"
|
||||
# 1.4 tag
|
||||
SRCREV = "f701bbca259f1f35e68d338f31f5373f75f3da5f"
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
|
||||
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
|
||||
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-storage-check-that-the-string-isn-t-empty-before-spl.patch"
|
||||
file://0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch"
|
||||
S = "${WORKDIR}/git"
|
||||
PR = "${INC_PR}.2"
|
||||
PR = "${INC_PR}.0"
|
Loading…
Reference in New Issue