mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 03:32:12 +02:00
wget: Upgrade 1.19.1 -> 1.19.2
Among other things, fix CVE-2017-13089 CVE-2017-13090 CVE-2017-6508 External References: https://nvd.nist.gov/vuln/detail/CVE-2017-13089 https://nvd.nist.gov/vuln/detail/CVE-2017-13090 https://nvd.nist.gov/vuln/detail/CVE-2017-6508 (From OE-Core rev: 97717693042e30ade6a568e45c333159eea43cbb) Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com> 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
70b3fffe5a
commit
30961f9959
@@ -1,44 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
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"
|
||||
SRC_URI[sha256sum] = "9e4f12da38cc6167d0752d934abe27c7b1599a9af294e73829be7ac7b5b4da40"
|
||||
|
||||
require wget.inc
|
||||
8
meta/recipes-extended/wget/wget_1.19.2.bb
Normal file
8
meta/recipes-extended/wget/wget_1.19.2.bb
Normal file
@@ -0,0 +1,8 @@
|
||||
SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
|
||||
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "caabf9727fa429626316619a6369fffa"
|
||||
SRC_URI[sha256sum] = "4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920"
|
||||
|
||||
require wget.inc
|
||||
Reference in New Issue
Block a user