| Submitter | Constantin Musca |
|---|---|
| Date | Aug. 16, 2012, 12:55 p.m. |
| Message ID | <1345121720-25925-7-git-send-email-constantinx.musca@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/34707/ |
| State | New |
| Headers | show |
Comments
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 <constantinx.musca@intel.com> >> --- >> ...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 <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 >> - >> 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" >>
On 08/16/2012 05:55 AM, Constantin Musca wrote: > Signed-off-by: Constantin Musca <constantinx.musca@intel.com> > --- > ...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 <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 > - > 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" >
That patch was included in 1.4 version. On Aug 17, 2012 7:20 PM, "Saul Wold" <sgw@linux.intel.com> wrote: > On 08/16/2012 05:55 AM, Constantin Musca wrote: > >> Signed-off-by: Constantin Musca <constantinx.musca@intel.com> >> --- >> ...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 ea8c7b3efce4c1762411e073893e94**8de5d552d6 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 >> - >> diff --git a/meta/recipes-connectivity/**connman/connman_1.3.bbb/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 = "**3c0fa84091524c7cd6237744f2088f**fee2f1d5ad" >> +# 1.4 tag >> +SRCREV = "**f701bbca259f1f35e68d338f31f537**3f75f3da5f" >> SRC_URI = "git://git.kernel.org/pub/scm/**network/connman/connman.git<http://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" >> >> > ______________________________**_________________ > Openembedded-core mailing list > Openembedded-core@lists.**openembedded.org<Openembedded-core@lists.openembedded.org> > http://lists.linuxtogo.org/**cgi-bin/mailman/listinfo/**openembedded-core<http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core> >
On 08/17/2012 08:51 AM, Constantin Musca wrote: > The patch is included in connman 1.4. > Yes, I understand that, but it should be in the commit message, that's all I am asking for. Sau! > 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 <constantinx.musca@intel.com> >>> --- >>> ...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 <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 >>> - >>> 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" >>> > > >
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 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 <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 - 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"
Signed-off-by: Constantin Musca <constantinx.musca@intel.com> --- ...ck-that-the-string-isn-t-empty-before-spl.patch | 37 -------------------- .../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%)