[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7280/8267] wget: Security fix CVE-2017-6508

[Emmanuele Bassi <ebassi src gnome org>]

commit 0782f4fce2450fbeb40e351b49cc000b00b98aae
Author: Yi Zhao <yi zhao windriver com>
Date:   Thu Aug 17 15:40:30 2017 +0800

    wget: Security fix CVE-2017-6508
    
    CVE-2017-6508: CRLF injection vulnerability in the url_parse function in
    url.c in Wget through 1.19.1 allows remote attackers to inject arbitrary
    HTTP headers via CRLF sequences in the host subcomponent of a URL.
    
    External References:
    https://nvd.nist.gov/vuln/detail/CVE-2017-6508
    
    Patch from:
    http://git.savannah.gnu.org/cgit/wget.git/commit/?id=4d729e322fae359a1aefaafec1144764a54e8ad4
    
    (From OE-Core rev: 28404157e07a915d1445166df566c8838f2cce57)
    
    Signed-off-by: Yi Zhao <yi zhao windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../recipes-extended/wget/wget/CVE-2017-6508.patch |   44 ++++++++++++++++++++
 meta/recipes-extended/wget/wget_1.19.1.bb          |    1 +
 2 files changed, 45 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-extended/wget/wget/CVE-2017-6508.patch 
b/meta/recipes-extended/wget/wget/CVE-2017-6508.patch
new file mode 100644
index 0000000..b9c290f
--- /dev/null
+++ b/meta/recipes-extended/wget/wget/CVE-2017-6508.patch
@@ -0,0 +1,44 @@
+From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim ruehsen gmx de>
+Date: Mon, 6 Mar 2017 10:04:22 +0100
+Subject: [PATCH] Fix CRLF injection in Wget host part
+
+* src/url.c (url_parse): Reject control characters in host part of URL
+
+Reported-by: Orange Tsai
+
+Upstream-Status: Backport
+[http://git.savannah.gnu.org/cgit/wget.git/commit/?id=4d729e322fae359a1aefaafec1144764a54e8ad4]
+
+CVE: CVE-2017-6508
+
+Signed-off-by: Yi Zhao <yi zhao windriver com>
+---
+ src/url.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/url.c b/src/url.c
+index 8f8ff0b..7d36b27 100644
+--- a/src/url.c
++++ b/src/url.c
+@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode)
+       url_unescape (u->host);
+       host_modified = true;
+ 
++      /* check for invalid control characters in host name */
++      for (p = u->host; *p; p++)
++        {
++          if (c_iscntrl(*p))
++            {
++              url_free(u);
++              error_code = PE_INVALID_HOST_NAME;
++              goto error;
++            }
++        }
++
+       /* Apply IDNA regardless of iri->utf8_encode status */
+       if (opt.enable_iri && iri)
+         {
+-- 
+2.7.4
+
diff --git a/meta/recipes-extended/wget/wget_1.19.1.bb b/meta/recipes-extended/wget/wget_1.19.1.bb
index 62313b2..78bde95 100644
--- a/meta/recipes-extended/wget/wget_1.19.1.bb
+++ b/meta/recipes-extended/wget/wget_1.19.1.bb
@@ -1,5 +1,6 @@
 SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
+           file://CVE-2017-6508.patch \
           "
 
 SRC_URI[md5sum] = "87cea36b7161fd43e3fd51a4e8b89689"