summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/wget
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2017-08-17 15:40:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 23:46:37 +0100
commit0782f4fce2450fbeb40e351b49cc000b00b98aae (patch)
treea8571ad5caa36d8041ae488b048a9b57ada81d75 /meta/recipes-extended/wget
parent583225d94ae7631f82afd618a00ca0f9ed63fce0 (diff)
downloadpoky-0782f4fce2450fbeb40e351b49cc000b00b98aae.tar.gz
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>
Diffstat (limited to 'meta/recipes-extended/wget')
-rw-r--r--meta/recipes-extended/wget/wget/CVE-2017-6508.patch44
-rw-r--r--meta/recipes-extended/wget/wget_1.19.1.bb1
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 0000000000..b9c290f656
--- /dev/null
+++ b/meta/recipes-extended/wget/wget/CVE-2017-6508.patch
@@ -0,0 +1,44 @@
1From 4d729e322fae359a1aefaafec1144764a54e8ad4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
3Date: Mon, 6 Mar 2017 10:04:22 +0100
4Subject: [PATCH] Fix CRLF injection in Wget host part
5
6* src/url.c (url_parse): Reject control characters in host part of URL
7
8Reported-by: Orange Tsai
9
10Upstream-Status: Backport
11[http://git.savannah.gnu.org/cgit/wget.git/commit/?id=4d729e322fae359a1aefaafec1144764a54e8ad4]
12
13CVE: CVE-2017-6508
14
15Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
16---
17 src/url.c | 11 +++++++++++
18 1 file changed, 11 insertions(+)
19
20diff --git a/src/url.c b/src/url.c
21index 8f8ff0b..7d36b27 100644
22--- a/src/url.c
23+++ b/src/url.c
24@@ -925,6 +925,17 @@ url_parse (const char *url, int *error, struct iri *iri, bool percent_encode)
25 url_unescape (u->host);
26 host_modified = true;
27
28+ /* check for invalid control characters in host name */
29+ for (p = u->host; *p; p++)
30+ {
31+ if (c_iscntrl(*p))
32+ {
33+ url_free(u);
34+ error_code = PE_INVALID_HOST_NAME;
35+ goto error;
36+ }
37+ }
38+
39 /* Apply IDNA regardless of iri->utf8_encode status */
40 if (opt.enable_iri && iri)
41 {
42--
432.7.4
44
diff --git a/meta/recipes-extended/wget/wget_1.19.1.bb b/meta/recipes-extended/wget/wget_1.19.1.bb
index 62313b24d7..78bde95951 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 @@
1SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ 1SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
2 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 2 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
3 file://CVE-2017-6508.patch \
3 " 4 "
4 5
5SRC_URI[md5sum] = "87cea36b7161fd43e3fd51a4e8b89689" 6SRC_URI[md5sum] = "87cea36b7161fd43e3fd51a4e8b89689"