mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 12:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

wget: Security fix for CVE-2019-5953

Browse Source 
Source: http://git.savannah.gnu.org/cgit/wget.git
MR: 89341
Type: Security Fix
Disposition: Backport from http://git.savannah.gnu.org/cgit/wget.git/commit/?id=692d5c5215de0db482c252492a92fc424cc6a97c
ChangeID: 1c19a2fd7ead88cc4ee92d425179d60d4635864b
Description:

Fixes CVE-2019-5953
Affects: < 1.20.1
(From OE-Core rev: c897b862c6cfaa341cc6155b2c9d98ea7ad02884)

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Armin Kuster
2019-06-05 13:26:58 -07:00
committed by Richard Purdie
parent f2d2148adb
commit 21188466bc
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-extended/wget/wget/CVE-2019-5953.patch Normal file
View File

@@ -0,0 +1,51 @@
From 692d5c5215de0db482c252492a92fc424cc6a97c Mon Sep 17 00:00:00 2001
From: Tim Ruehsen <tim.ruehsen@gmx.de>
Date: Fri, 5 Apr 2019 11:50:44 +0200
Subject: [PATCH] Fix a buffer overflow vulnerability
* src/iri.c(do_conversion): Reallocate the output buffer to a larger
size if it is already full
Upstream-Status: Backport
http://git.savannah.gnu.org/cgit/wget.git/commit/?id=692d5c5215de0db482c252492a92fc424cc6a97c
CVE: CVE-2019-5953
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
src/iri.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
Index: wget-1.19.5/src/iri.c
===================================================================
--- wget-1.19.5.orig/src/iri.c
+++ wget-1.19.5/src/iri.c
@@ -151,8 +151,11 @@ do_conversion (const char *tocode, const
*out = s = xmalloc (outlen + 1);
done = 0;
+ DEBUGP (("iconv %s -> %s\n", tocode, fromcode));
+
for (;;)
{
+ DEBUGP (("iconv outlen=%d inlen=%d\n", outlen, inlen));
if (iconv (cd, (ICONV_CONST char **) &in, &inlen, out, &outlen) != (size_t)(-1) &&
iconv (cd, NULL, NULL, out, &outlen) != (size_t)(-1))
{
@@ -187,11 +190,14 @@ do_conversion (const char *tocode, const
}
else if (errno == E2BIG) /* Output buffer full */
{
+ logprintf (LOG_VERBOSE,
+ _("Reallocate output buffer len=%d outlen=%d inlen=%d\n"), len, outlen, inlen);
tooshort++;
done = len;
- len = outlen = done + inlen * 2;
- s = xrealloc (s, outlen + 1);
- *out = s + done;
+ len = done + inlen * 2;
+ s = xrealloc (s, len + 1);
+ *out = s + done - outlen;
+ outlen += inlen * 2;
}
else /* Weird, we got an unspecified error */
{

1
meta/recipes-extended/wget/wget_1.19.5.bb
View File

@@ -1,6 +1,7 @@
SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://0002-improve-reproducibility.patch \
file://CVE-2019-5953.patch \
"
SRC_URI[md5sum] = "2db6f03d655041f82eb64b8c8a1fa7da"