From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJ0hB-0001nX-1A for guix-patches@gnu.org; Thu, 08 Jun 2017 12:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJ0h8-0001vI-Ax for guix-patches@gnu.org; Thu, 08 Jun 2017 12:54:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dJ0h8-0001v8-6f for guix-patches@gnu.org; Thu, 08 Jun 2017 12:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dJ0h7-0005Iy-TS for guix-patches@gnu.org; Thu, 08 Jun 2017 12:54:01 -0400 Subject: bug#27289: [PATCH] gnu: raptor2: Fix heap overflow bug. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJ0g8-0001WY-7O for guix-patches@gnu.org; Thu, 08 Jun 2017 12:53:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJ0g4-0001W4-T9 for guix-patches@gnu.org; Thu, 08 Jun 2017 12:53:00 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:57835) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dJ0g4-0001VP-Hq for guix-patches@gnu.org; Thu, 08 Jun 2017 12:52:56 -0400 From: Marius Bakke Date: Thu, 8 Jun 2017 18:52:52 +0200 Message-Id: <20170608165252.29705-1-mbakke@fastmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27289@debbugs.gnu.org * gnu/packages/patches/raptor2-heap-overflow.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/rdf.scm (raptor2): Use it. --- gnu/local.mk | 1 + gnu/packages/patches/raptor2-heap-overflow.patch | 51 ++++++++++++++++++++++++ gnu/packages/rdf.scm | 2 + 3 files changed, 54 insertions(+) create mode 100644 gnu/packages/patches/raptor2-heap-overflow.patch diff --git a/gnu/local.mk b/gnu/local.mk index ab3fbb2d3..660b90cf7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -967,6 +967,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ %D%/packages/patches/rapicorn-isnan.patch \ + %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoison-shell.patch \ %D%/packages/patches/rcs-5.9.4-noreturn.patch \ %D%/packages/patches/readline-link-ncurses.patch \ diff --git a/gnu/packages/patches/raptor2-heap-overflow.patch b/gnu/packages/patches/raptor2-heap-overflow.patch new file mode 100644 index 000000000..ce2a4516f --- /dev/null +++ b/gnu/packages/patches/raptor2-heap-overflow.patch @@ -0,0 +1,51 @@ +This patch addresses two heap overflow bugs in raptor2: + +http://seclists.org/oss-sec/2017/q2/424 + +Patch copied from libreoffice: + +https://github.com/LibreOffice/core/blob/master/external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 + +From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sun, 16 Apr 2017 23:15:12 +0100 +Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer + +(raptor_xml_writer_start_element_common): Calculate max including for +each attribute a potential name and value. + +Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617 +and #0000618 http://bugs.librdf.org/mantis/view.php?id=618 +--- + src/raptor_xml_writer.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 693b946..0d3a36a 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + size_t nspace_declarations_count = 0; + unsigned int i; + +- /* max is 1 per element and 1 for each attribute + size of declared */ + if(nstack) { +- int nspace_max_count = element->attribute_count+1; ++ int nspace_max_count = element->attribute_count * 2; /* attr and value */ ++ if(element->name->nspace) ++ nspace_max_count++; + if(element->declared_nspaces) + nspace_max_count += raptor_sequence_size(element->declared_nspaces); + if(element->xml_language) +@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + } + } + +- /* Add the attribute + value */ ++ /* Add the attribute's value */ + nspace_declarations[nspace_declarations_count].declaration= + raptor_qname_format_as_xml(element->attributes[i], + &nspace_declarations[nspace_declarations_count].length); +-- +2.9.3 + diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 7b7fe6085..6b5cfb013 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -53,6 +53,8 @@ (method url-fetch) (uri (string-append "http://download.librdf.org/source/" name "-" version ".tar.gz")) + (patches + (search-patches "raptor2-heap-overflow.patch")) (sha256 (base32 "1vc02im4mpc28zxzgli68k6j0dakh0k3s389bm436yvqajxg19xd")))) -- 2.13.1