summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libsoup
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-06-28 18:37:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-28 23:33:55 +0100
commit112683815ed1f63a96e845f264a2fd3390c6d01b (patch)
tree982385fcbff442808c372bc9b15aed8adb99e107 /meta/recipes-support/libsoup
parent8f9ceebb197dba10f2d08449de2dd64584de06bb (diff)
downloadopenembedded-core-112683815ed1f63a96e845f264a2fd3390c6d01b.tar.gz
openembedded-core-112683815ed1f63a96e845f264a2fd3390c6d01b.tar.bz2
openembedded-core-112683815ed1f63a96e845f264a2fd3390c6d01b.zip
libsoup: fix CVE-2018-12910
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libsoup')
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4/CVE-2018-12910.patch32
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb4
2 files changed, 34 insertions, 2 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2018-12910.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2018-12910.patch
new file mode 100644
index 0000000000..158bf93093
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2018-12910.patch
@@ -0,0 +1,32 @@
+CVE: CVE-2018-12910
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From db2b0d5809d5f8226d47312b40992cadbcde439f Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@igalia.com>
+Date: Sun, 24 Jun 2018 19:46:19 -0500
+Subject: [PATCH] cookie-jar: bail if hostname is an empty string
+
+There are several other ways to fix the problem with this function, but
+skipping over all of the code is probably the simplest.
+
+Fixes #3
+---
+ libsoup/soup-cookie-jar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-cookie-jar.c b/libsoup/soup-cookie-jar.c
+index 2369c8a7..b2b78909 100644
+--- a/libsoup/soup-cookie-jar.c
++++ b/libsoup/soup-cookie-jar.c
+@@ -307,7 +307,7 @@ get_cookies (SoupCookieJar *jar, SoupURI *uri, gboolean for_http, gboolean copy_
+
+ priv = soup_cookie_jar_get_instance_private (jar);
+
+- if (!uri->host)
++ if (!uri->host || !uri->host[0])
+ return NULL;
+
+ /* The logic here is a little weird, but the plan is that if
+--
+2.17.1
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb
index a9f3554f16..ba3e86a03c 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.62.2.bb
@@ -9,8 +9,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 intltool-native"
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
-SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz"
-
+SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
+ file://CVE-2018-12910.patch"
SRC_URI[md5sum] = "eaf99b04ac8968ed2b26f2509ba75584"
SRC_URI[sha256sum] = "9e536fe3da60b25d2c63addb84a9d5072d00b0d8b8cbeabc629a6bcd63f879b6"