From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1T2PsO-0002hx-IX for openembedded-core@lists.openembedded.org; Fri, 17 Aug 2012 18:58:24 +0200 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 17 Aug 2012 09:46:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.77,785,1336374000"; d="scan'208";a="135464152" Received: from costin-desktop (HELO [10.237.105.33]) ([10.237.105.33]) by AZSMGA002.ch.intel.com with ESMTP; 17 Aug 2012 09:46:23 -0700 Message-ID: <502E6875.5050009@intel.com> Date: Fri, 17 Aug 2012 18:51:17 +0300 From: Constantin Musca User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: Saul Wold References: <1345121720-25925-1-git-send-email-constantinx.musca@intel.com> <1345121720-25925-7-git-send-email-constantinx.musca@intel.com> <502E6F19.4000402@linux.intel.com> In-Reply-To: <502E6F19.4000402@linux.intel.com> Cc: Patches and discussions about the oe-core layer Subject: Re: [PATCH 6/6] connman: upgrade to 1.4 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2012 16:58:24 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit The patch is included in connman 1.4. Constantin Musca On 08/17/2012 07:19 PM, Saul Wold wrote: > On 08/16/2012 05:55 AM, Constantin Musca wrote: >> Signed-off-by: Constantin Musca >> --- >> ...ck-that-the-string-isn-t-empty-before-spl.patch | 37 >> -------------------- > Why was the patch removed, need to have that in the commit message also. > > Sau! > >> .../connman/{connman_1.3.bb => connman_1.4.bb} | 9 +++-- >> 2 files changed, 4 insertions(+), 42 deletions(-) >> delete mode 100644 >> meta/recipes-connectivity/connman/connman/0001-storage-check-that-the-string-isn-t-empty-before-spl.patch >> rename meta/recipes-connectivity/connman/{connman_1.3.bb => >> connman_1.4.bb} (69%) >> >> 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 @@ >> -From ea8c7b3efce4c1762411e073893e948de5d552d6 Mon Sep 17 00:00:00 2001 >> -From: Ross Burton >> -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 >> -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.4.bb >> similarity index 69% >> rename from meta/recipes-connectivity/connman/connman_1.3.bb >> rename to 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 @@ >> 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" >>