mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 18:32:12 +02:00
libsoup: fix CVE-2018-12910
(From OE-Core rev: 112683815ed1f63a96e845f264a2fd3390c6d01b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0c09b20036
commit
4205e87a77
@@ -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
|
||||
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user