Hello community, here is the log from the commit of package libxslt for openSUSE:Factory checked in at 2019-07-08 15:02:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxslt (Old) and /work/SRC/openSUSE:Factory/.libxslt.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxslt" Mon Jul 8 15:02:27 2019 rev:58 rq:713210 version:1.1.33 Changes: -------- --- /work/SRC/openSUSE:Factory/libxslt/libxslt-python.changes 2019-04-17 10:04:47.366530885 +0200 +++ /work/SRC/openSUSE:Factory/.libxslt.new.4615/libxslt-python.changes 2019-07-08 15:02:28.870666660 +0200 @@ -1,0 +2,18 @@ +Tue Jul 2 15:02:27 UTC 2019 - Pedro Monreal Gonzalez <[email protected]> + +- Security fix: [bsc#1140101, CVE-2019-13118] + * Fix uninitialized read with UTF-8 grouping chars. Read of + uninitialized stack data due to too narrow xsl:number + instruction and an invalid character + * Added libxslt-CVE-2019-13118.patch + +------------------------------------------------------------------- +Tue Jul 2 15:00:56 UTC 2019 - Pedro Monreal Gonzalez <[email protected]> + +- Security fix: [bsc#1140095, CVE-2019-13117] + * Fix uninitialized read of xsl:number token. An xsl number with + certain format strings could lead to a uninitialized read in + xsltNumberFormatInsertNumbers + * Added libxslt-CVE-2019-13117.patch + +------------------------------------------------------------------- libxslt.changes: same change New: ---- libxslt-CVE-2019-13117.patch libxslt-CVE-2019-13118.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxslt-python.spec ++++++ --- /var/tmp/diff_new_pack.TJm1Ty/_old 2019-07-08 15:02:29.694667906 +0200 +++ /var/tmp/diff_new_pack.TJm1Ty/_new 2019-07-08 15:02:29.702667917 +0200 @@ -34,6 +34,10 @@ Patch2: libxslt-random-seed.patch # PATCH-FIX-UPSTREAM bsc#1132160 CVE-2019-11068 Fix security framework bypass Patch4: libxslt-CVE-2019-11068.patch +# PATCH-FIX-UPSTREAM bsc#1140095 CVE-2019-13117 Fix uninitialized read of xsl:number token +Patch5: libxslt-CVE-2019-13117.patch +# PATCH-FIX-UPSTREAM bsc#1140101 CVE-2019-13118 Fix uninitialized read with UTF-8 grouping chars +Patch6: libxslt-CVE-2019-13118.patch BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: libtool @@ -61,6 +65,8 @@ %patch1 %patch2 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build autoreconf -fvi ++++++ libxslt.spec ++++++ --- /var/tmp/diff_new_pack.TJm1Ty/_old 2019-07-08 15:02:29.734667965 +0200 +++ /var/tmp/diff_new_pack.TJm1Ty/_new 2019-07-08 15:02:29.738667972 +0200 @@ -36,6 +36,10 @@ Patch3: libxslt-random-seed.patch # PATCH-FIX-UPSTREAM bsc#1132160 CVE-2019-11068 Fix security framework bypass Patch4: libxslt-CVE-2019-11068.patch +# PATCH-FIX-UPSTREAM bsc#1140095 CVE-2019-13117 Fix uninitialized read of xsl:number token +Patch5: libxslt-CVE-2019-13117.patch +# PATCH-FIX-UPSTREAM bsc#1140101 CVE-2019-13118 Fix uninitialized read with UTF-8 grouping chars +Patch6: libxslt-CVE-2019-13118.patch BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: libtool @@ -105,6 +109,8 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build autoreconf -fvi ++++++ libxslt-CVE-2019-13117.patch ++++++ >From c5eb6cf3aba0af048596106ed839b4ae17ecbcb1 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer <[email protected]> Date: Sat, 27 Apr 2019 11:19:48 +0200 Subject: [PATCH] Fix uninitialized read of xsl:number token Found by OSS-Fuzz. --- libxslt/numbers.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libxslt/numbers.c b/libxslt/numbers.c index 89e1f668..75c31eba 100644 --- a/libxslt/numbers.c +++ b/libxslt/numbers.c @@ -382,7 +382,10 @@ xsltNumberFormatTokenize(const xmlChar *format, tokens->tokens[tokens->nTokens].token = val - 1; ix += len; val = xmlStringCurrentChar(NULL, format+ix, &len); - } + } else { + tokens->tokens[tokens->nTokens].token = (xmlChar)'0'; + tokens->tokens[tokens->nTokens].width = 1; + } } else if ( (val == (xmlChar)'A') || (val == (xmlChar)'a') || (val == (xmlChar)'I') || -- 2.21.0 ++++++ libxslt-CVE-2019-13118.patch ++++++ >From 6ce8de69330783977dd14f6569419489875fb71b Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer <[email protected]> Date: Mon, 3 Jun 2019 13:14:45 +0200 Subject: [PATCH] Fix uninitialized read with UTF-8 grouping chars The character type in xsltFormatNumberConversion was too narrow and an invalid character/length combination could be passed to xsltNumberFormatDecimal, resulting in an uninitialized read. Found by OSS-Fuzz. --- libxslt/numbers.c | 5 +++-- tests/docs/bug-222.xml | 1 + tests/general/bug-222.out | 2 ++ tests/general/bug-222.xsl | 6 ++++++ 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 tests/docs/bug-222.xml create mode 100644 tests/general/bug-222.out create mode 100644 tests/general/bug-222.xsl diff --git a/libxslt/numbers.c b/libxslt/numbers.c index f1ed8846..20b99d5a 100644 --- a/libxslt/numbers.c +++ b/libxslt/numbers.c @@ -1298,13 +1298,14 @@ OUTPUT_NUMBER: number = floor((scale * number + 0.5)) / scale; if ((self->grouping != NULL) && (self->grouping[0] != 0)) { + int gchar; len = xmlStrlen(self->grouping); - pchar = xsltGetUTF8Char(self->grouping, &len); + gchar = xsltGetUTF8Char(self->grouping, &len); xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], format_info.integer_digits, format_info.group, - pchar, len); + gchar, len); } else xsltNumberFormatDecimal(buffer, floor(number), self->zeroDigit[0], format_info.integer_digits, diff --git a/tests/docs/bug-222.xml b/tests/docs/bug-222.xml new file mode 100644 index 00000000..69d62f2c --- /dev/null +++ b/tests/docs/bug-222.xml @@ -0,0 +1 @@ +<doc/> diff --git a/tests/general/bug-222.out b/tests/general/bug-222.out new file mode 100644 index 00000000..e3139698 --- /dev/null +++ b/tests/general/bug-222.out @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +1⠢0 diff --git a/tests/general/bug-222.xsl b/tests/general/bug-222.xsl new file mode 100644 index 00000000..e32dc473 --- /dev/null +++ b/tests/general/bug-222.xsl @@ -0,0 +1,6 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> + <xsl:decimal-format name="f" grouping-separator="⠢"/> + <xsl:template match="/"> + <xsl:value-of select="format-number(10,'#⠢0','f')"/> + </xsl:template> +</xsl:stylesheet> -- 2.21.0
