diff options
| author | Denis OSTERLAND <denis.osterland@diehl.com> | 2018-06-22 11:35:22 +0000 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-06-27 10:25:44 +0200 |
| commit | 228f10fdb2d3c6865e9c5feedec0d21c8bbb51cd (patch) | |
| tree | 0d9c1e45b6e42caa14fe3c687ece703657f4eac0 /patches | |
| parent | de4f39b761ac86dab8c43193ca9bd985e58de612 (diff) | |
| download | ptxdist-228f10fdb2d3c6865e9c5feedec0d21c8bbb51cd.tar.gz ptxdist-228f10fdb2d3c6865e9c5feedec0d21c8bbb51cd.tar.xz | |
libxml2: apply fix for CVE-2017-8872
Taken from debian buster libxml2_2.9.7+dfsg-1.
Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libxml2-2.9.7/0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch | 31 | ||||
| -rw-r--r-- | patches/libxml2-2.9.7/series | 5 |
2 files changed, 34 insertions, 2 deletions
diff --git a/patches/libxml2-2.9.7/0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch b/patches/libxml2-2.9.7/0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch new file mode 100644 index 000000000..c23cb47e5 --- /dev/null +++ b/patches/libxml2-2.9.7/0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch @@ -0,0 +1,31 @@ +From: Marcus Meissner <meissner@suse.de> +Date: Wed, 3 Jan 2018 14:43:41 +0100 +Subject: [PATCH] Out-of-bounds read in htmlParseTryOrFinish + +Origin: vendor, https://bugzilla.novell.com/attachment.cgi?id=732309 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=775200 +Bug-Debian: https://bugs.debian.org/862450 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-8872 +Bug-SUSE: https://bugzilla.novell.com/show_bug.cgi?id=1038444 +Forwarded: yes, https://bugzilla.gnome.org/attachment.cgi?id=366193 +Reviewed-by: Salvatore Bonaccorso <carnil@debian.org> +Last-Update: 2018-01-03 +--- + parser.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/parser.c b/parser.c +index 1c5e036ea265..025111067ae8 100644 +--- a/parser.c ++++ b/parser.c +@@ -12467,6 +12467,10 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) { + ctxt->input->cur = BAD_CAST""; + ctxt->input->base = ctxt->input->cur; + ctxt->input->end = ctxt->input->cur; ++ if (ctxt->input->buf) ++ xmlBufEmpty (ctxt->input->buf->buffer); ++ else ++ ctxt->input->length = 0; + } + } + diff --git a/patches/libxml2-2.9.7/series b/patches/libxml2-2.9.7/series index 05ba5ddea..07fceed7b 100644 --- a/patches/libxml2-2.9.7/series +++ b/patches/libxml2-2.9.7/series @@ -1,6 +1,7 @@ # generated by git-ptx-patches #tag:base --start-number 1 -#tag:upstream --start-number 1 +#tag:debian --start-number 100 +0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch #tag:ptx --start-number 200 0200-xml2-config-is-not-SYSROOT-aware.patch -# b6720be956d1b4619bc1c347a0ceb1dd - git-ptx-patches magic +# 5b451bf42a96789ecd1e84388af58f95 - git-ptx-patches magic |