summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorDenis OSTERLAND <denis.osterland@diehl.com>2017-08-07 12:14:43 +0000
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-08-28 11:32:10 +0200
commit2f07c01321657abf1a346079242fe1aa5e328158 (patch)
treea2d53838d301a66c7aba4545e0bf332f78fedf58 /patches
parentbea075ac839499e42f6c95dae25dfb4fa683e797 (diff)
downloadptxdist-2f07c01321657abf1a346079242fe1aa5e328158.tar.gz
ptxdist-2f07c01321657abf1a346079242fe1aa5e328158.tar.xz
wget: version bump 1.11.4 -> 1.19.1
Add configure commandline options. Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> [mol: resort and add more configure options] Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/wget-1.19.1/CVE-2017-6508.patch31
-rw-r--r--patches/wget-1.19.1/series1
2 files changed, 32 insertions, 0 deletions
diff --git a/patches/wget-1.19.1/CVE-2017-6508.patch b/patches/wget-1.19.1/CVE-2017-6508.patch
new file mode 100644
index 000000000..bb2f63f5c
--- /dev/null
+++ b/patches/wget-1.19.1/CVE-2017-6508.patch
@@ -0,0 +1,31 @@
+From: Tim Rühsen <tim.ruehsen@gmx.de>
+Date: Mon Mar 6 10:04:22 2017 +0100
+Subject: Fix CRLF injection in Wget host part
+
+* src/url.c (url_parse): Reject control characters in host part of URL
+
+Reported-by: Orange Tsai
+
+commit 4d729e322fae359a1aefaafec1144764a54e8ad4
+diff --git a/src/url.c b/src/url.c
+index 8f8ff0b8..7d36b27d 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)
+ {
diff --git a/patches/wget-1.19.1/series b/patches/wget-1.19.1/series
new file mode 100644
index 000000000..f58bfe356
--- /dev/null
+++ b/patches/wget-1.19.1/series
@@ -0,0 +1 @@
+CVE-2017-6508.patch