NetBSD Problem Report #53704
From www@NetBSD.org Mon Nov 5 23:27:50 2018
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
by mollari.NetBSD.org (Postfix) with ESMTPS id 305DD7A1E9
for <gnats-bugs@gnats.NetBSD.org>; Mon, 5 Nov 2018 23:27:50 +0000 (UTC)
Message-Id: <20181105232749.404AE7A202@mollari.NetBSD.org>
Date: Mon, 5 Nov 2018 23:27:49 +0000 (UTC)
From: attila@fueloep.org
Reply-To: attila@fueloep.org
To: gnats-bugs@NetBSD.org
Subject: textproc/libxml2: Fix CVE-2017-8872
X-Send-Pr-Version: www-1.0
>Number: 53704
>Category: pkg
>Synopsis: textproc/libxml2: Fix CVE-2017-8872
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: leot
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Mon Nov 05 23:30:00 +0000 2018
>Closed-Date: Fri Nov 09 15:36:56 +0000 2018
>Last-Modified: Fri Nov 09 18:55:00 +0000 2018
>Originator: Attila Fülöp
>Release: trunk
>Organization:
>Environment:
SunOS bld-181018 5.11 joyent_20181011T004530Z i86pc i386 i86pc Solaris
>Description:
Fixes CVE-2017-8872.
See: https://gitlab.gnome.org/GNOME/libxml2/issues/26
Backported commit: https://gitlab.gnome.org/GNOME/libxml2/commit/123234f2cfcd9e9b9f83047eee1dc17b4c3f4407
Patch attached.
>How-To-Repeat:
>Fix:
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 89d09e2660f..ee4fcf1cc90 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -2,7 +2,7 @@
.include "../../textproc/libxml2/Makefile.common"
-PKGREVISION= 3
+PKGREVISION= 4
COMMENT= XML parser library from the GNOME project
LICENSE= modified-bsd
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index e8e2979f4ff..6626bc687f8 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -10,8 +10,10 @@ SHA1 (patch-ac) = 34afe787f6012b460a85be993048e133907a1621
SHA1 (patch-ad) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
SHA1 (patch-ae) = 4eede9719724f94402e850ee6d6043a74aaf62b2
SHA1 (patch-encoding.c) = 6cf0a7d421828b9f40a4079ee85adb791c54d096
+SHA1 (patch-parser.c) = 4304bae3d6797c03bca82839173a8d08be7a37eb
SHA1 (patch-python_libxml.py) = 869a72ae5ba2e27e6d46552878890acb22337675
SHA1 (patch-python_libxml2.py) = 209d105b0f3aedb834091390a7c6819705108e34
SHA1 (patch-python_setup.py) = 7771fd02ee6779463f1d3321f099d7e6d19cd1b1
+SHA1 (patch-result_errors_759573.xml.err) = 9246b60612d3bc07edbcf75f0ddf65ca6a105792
SHA1 (patch-xpath.c) = 9b9832e36e947598d8f5dade80181e82bff54a5c
SHA1 (patch-xzlib.c) = a9b4de24d844b9fee30988ae4dbdee950797fd0d
diff --git a/textproc/libxml2/patches/patch-parser.c b/textproc/libxml2/patches/patch-parser.c
new file mode 100644
index 00000000000..a3d2c4d24d7
--- /dev/null
+++ b/textproc/libxml2/patches/patch-parser.c
@@ -0,0 +1,23 @@
+$NetBSD$
+
+Fixes CVE-2017-8872.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=775200
+https://gitlab.gnome.org/GNOME/libxml2/issues/26
+https://gitlab.gnome.org/GNOME/libxml2/commit/123234f2cfcd9e9b9f83047eee1dc17b4c3f4407
+
+--- parser.c.orig 2018-01-25 06:44:40.000000000 +0000
++++ parser.c
+@@ -12462,7 +12462,12 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
+ ctxt->input->free((xmlChar *) ctxt->input->base);
+ ctxt->input->free = NULL;
+ }
++ if (ctxt->input->buf != NULL) {
++ xmlFreeParserInputBuffer(ctxt->input->buf);
++ ctxt->input->buf = NULL;
++ }
+ ctxt->input->cur = BAD_CAST"";
++ ctxt->input->length = 0;
+ ctxt->input->base = ctxt->input->cur;
+ ctxt->input->end = ctxt->input->cur;
+ }
diff --git a/textproc/libxml2/patches/patch-result_errors_759573.xml.err b/textproc/libxml2/patches/patch-result_errors_759573.xml.err
new file mode 100644
index 00000000000..91b03e7ea19
--- /dev/null
+++ b/textproc/libxml2/patches/patch-result_errors_759573.xml.err
@@ -0,0 +1,32 @@
+$NetBSD$
+
+Test output adjustment for CVE-2017-8872 fix.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=775200
+https://gitlab.gnome.org/GNOME/libxml2/issues/26
+https://gitlab.gnome.org/GNOME/libxml2/commit/123234f2cfcd9e9b9f83047eee1dc17b4c3f4407
+
+--- result/errors/759573.xml.err.orig 2017-07-23 05:10:06.000000000 +0000
++++ result/errors/759573.xml.err
+@@ -21,14 +21,11 @@ Entity: line 1:
+ ^
+ ./test/errors/759573.xml:1: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
+-<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '%<![INCLUDE[000%ஸ00
+- ^
++
++^
+ ./test/errors/759573.xml:1: parser error : DOCTYPE improperly terminated
+-<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '%<![INCLUDE[000%ஸ00
+- ^
+-./test/errors/759573.xml:1: parser error : StartTag: invalid element name
+-<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '%<![INCLUDE[000%ஸ00
+- ^
+-./test/errors/759573.xml:1: parser error : Extra content at the end of the document
+-<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '%<![INCLUDE[000%ஸ00
+- ^
++
++^
++./test/errors/759573.xml:1: parser error : Start tag expected, '<' not found
++
++^
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: pkg-manager->leot
Responsible-Changed-By: leot@NetBSD.org
Responsible-Changed-When: Fri, 09 Nov 2018 15:08:34 +0000
Responsible-Changed-Why:
Take
From: "Leonardo Taccari" <leot@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/53704 CVS commit: pkgsrc/textproc/libxml2
Date: Fri, 9 Nov 2018 15:31:47 +0000
Module Name: pkgsrc
Committed By: leot
Date: Fri Nov 9 15:31:46 UTC 2018
Modified Files:
pkgsrc/textproc/libxml2: Makefile distinfo
Added Files:
pkgsrc/textproc/libxml2/patches: patch-parser.c
patch-result_errors_759573.xml.err
Log Message:
libxml2: Add a patch from upstream to fix CVE-2017-8872
Patch provided by Attila Fülöp via PR pkg/53704, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 pkgsrc/textproc/libxml2/Makefile
cvs rdiff -u -r1.127 -r1.128 pkgsrc/textproc/libxml2/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/textproc/libxml2/patches/patch-parser.c
cvs rdiff -u -r0 -r1.1 \
pkgsrc/textproc/libxml2/patches/patch-result_errors_759573.xml.err
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: leot@NetBSD.org
State-Changed-When: Fri, 09 Nov 2018 15:36:56 +0000
State-Changed-Why:
Patch committed! (I have remanually applied the patch because tabs
were accidently replaced by spaces)
Thank you Attila for the PR and patch!
From: =?UTF-8?B?QXR0aWxhIEbDvGzDtnA=?= <attila@fueloep.org>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/53704 (textproc/libxml2: Fix CVE-2017-8872)
Date: Fri, 9 Nov 2018 18:32:08 +0100
Leonardo,
> I have remanually applied the patch because tabs
> were accidently replaced by spaces)
Sorry for that, must have happened while copy & pasting into the web
form. I'll setup mailing in my build zone and use `send-pr` in the future=
.
> Thank you Attila for the PR and patch!
My pleasure, thank you for fixing the whitespace issue and for merging.
Attila
From: Leonardo Taccari <leot@NetBSD.org>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/53704 (textproc/libxml2: Fix CVE-2017-8872)
Date: Fri, 09 Nov 2018 18:44:37 +0100
Hello Attila,
Attila Fülöp writes:
> > I have remanually applied the patch because tabs
> > were accidently replaced by spaces)
>
> Sorry for that, must have happened while copy & pasting into the web
> form. I'll setup mailing in my build zone and use `send-pr` in the future.
> [...]
Don't worry! :)
Probably the copypasto correctly worked but the browser converted
tabs to spaces (probably Firefox does that!), so, unfortunately I
think that's not easy to workaround.
Thank you again!
From: =?UTF-8?B?QXR0aWxhIEbDvGzDtnA=?= <attila@fueloep.org>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/53704 (textproc/libxml2: Fix CVE-2017-8872)
Date: Fri, 9 Nov 2018 19:53:38 +0100
> Don't worry! :)
Thanks :)
> Probably the copypasto correctly worked but the browser converted
> tabs to spaces (probably Firefox does that!), so, unfortunately I
> think that's not easy to workaround.
Yes, most likely. I'm using Firefox and c&p tabs out of my terminal
window works as expected. The workaround is to use `send-pr`, which
is fine once I can send mails from within the build zone.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.